diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 11:23:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 11:23:14 -0700 |
| commit | b66e1f11ebc429569a3784aaf64123633d9e3ed1 (patch) | |
| tree | d49f96acc682aaf29416921428110da5fd78fea4 /drivers/char | |
| parent | 1be1d6b7f3f6e3a87f872dd5e7a867d03d8a6851 (diff) | |
| parent | 5c598b3428c372a1209597cee99a70da20625876 (diff) | |
| download | linux-b66e1f11ebc429569a3784aaf64123633d9e3ed1.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] fix sysctl_nr_open bugs
[PATCH] sanitize anon_inode_getfd()
[PATCH] split linux/file.h
[PATCH] make osf_select() use core_sys_select()
[PATCH] remove horrors with irix tty ioctls handling
[PATCH] fix file and descriptor handling in perfmon
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tty_audit.c | 1 | ||||
| -rw-r--r-- | drivers/char/tty_io.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/tty_audit.c b/drivers/char/tty_audit.c index 6342b0534f4d..3582f43345a8 100644 --- a/drivers/char/tty_audit.c +++ b/drivers/char/tty_audit.c @@ -11,6 +11,7 @@ #include <linux/audit.h> #include <linux/file.h> +#include <linux/fdtable.h> #include <linux/tty.h> struct tty_audit_buf { diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 1d298c2cf930..49c1a2267a55 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -78,6 +78,7 @@ #include <linux/tty_flip.h> #include <linux/devpts_fs.h> #include <linux/file.h> +#include <linux/fdtable.h> #include <linux/console.h> #include <linux/timer.h> #include <linux/ctype.h> |