diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /drivers/char/tty_audit.c | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'drivers/char/tty_audit.c')
| -rw-r--r-- | drivers/char/tty_audit.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/tty_audit.c b/drivers/char/tty_audit.c index 34ab6d798f81..55ba6f142883 100644 --- a/drivers/char/tty_audit.c +++ b/drivers/char/tty_audit.c | |||
| @@ -10,8 +10,6 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/audit.h> | 12 | #include <linux/audit.h> |
| 13 | #include <linux/file.h> | ||
| 14 | #include <linux/fdtable.h> | ||
| 15 | #include <linux/tty.h> | 13 | #include <linux/tty.h> |
| 16 | 14 | ||
| 17 | struct tty_audit_buf { | 15 | struct tty_audit_buf { |