diff options
author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /init | |
parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index ae04eb78a93a..b2f3b566790e 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | #define __KERNEL_SYSCALLS__ | 12 | #define __KERNEL_SYSCALLS__ |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
17 | #include <linux/proc_fs.h> | 16 | #include <linux/proc_fs.h> |