diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 13:37:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 13:37:06 -0500 |
commit | 9b8ab9f6c37c610feea20edfb357a3b8a43d39bd (patch) | |
tree | 02d18c920a03a600e915d66d6a471d900857b3ac /fs/proc/root.c | |
parent | 12472b4165a21f5415ff4f60f8f46311a6b7b9ac (diff) | |
parent | f23f6e08c47acbdd20e9c49a79da8c404ea168e1 (diff) |
Merge branch 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird
* 'for-linus4' of master.kernel.org:/pub/scm/linux/kernel/git/viro/bird:
[PATCH] severing poll.h -> mm.h
[PATCH] severing skbuff.h -> mm.h
[PATCH] severing skbuff.h -> poll.h
[PATCH] severing skbuff.h -> highmem.h
[PATCH] severing uaccess.h -> sched.h
[PATCH] severing fs.h, radix-tree.h -> sched.h
[PATCH] severing module.h->sched.h
Diffstat (limited to 'fs/proc/root.c')
-rw-r--r-- | fs/proc/root.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index ffe66c38488b..64d242b6dcfa 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/proc_fs.h> | 13 | #include <linux/proc_fs.h> |
14 | #include <linux/stat.h> | 14 | #include <linux/stat.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/sched.h> | ||
16 | #include <linux/module.h> | 17 | #include <linux/module.h> |
17 | #include <linux/bitops.h> | 18 | #include <linux/bitops.h> |
18 | #include <linux/smp_lock.h> | 19 | #include <linux/smp_lock.h> |