diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-12 17:47:08 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-12 17:47:08 -0500 |
| commit | 94bc2be31a01a3055ec94176e595dfe208e92d3b (patch) | |
| tree | ebfbe81c6718a6390bfa1b99c6d228237d818576 /kernel/uid16.c | |
| parent | c32a0b689cb9cc160cfcd19735bbf50bb70c6ef4 (diff) | |
| parent | 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'kernel/uid16.c')
| -rw-r--r-- | kernel/uid16.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/uid16.c b/kernel/uid16.c index f669941e8b26..aa25605027c8 100644 --- a/kernel/uid16.c +++ b/kernel/uid16.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/notifier.h> | 10 | #include <linux/notifier.h> |
| 11 | #include <linux/reboot.h> | 11 | #include <linux/reboot.h> |
| 12 | #include <linux/prctl.h> | 12 | #include <linux/prctl.h> |
| 13 | #include <linux/capability.h> | ||
| 13 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 14 | #include <linux/highuid.h> | 15 | #include <linux/highuid.h> |
| 15 | #include <linux/security.h> | 16 | #include <linux/security.h> |