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/9p/fid.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/9p/fid.c')
-rw-r--r-- | fs/9p/fid.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/9p/fid.c b/fs/9p/fid.c index 70492ccb4385..27507201f9e7 100644 --- a/fs/9p/fid.c +++ b/fs/9p/fid.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
24 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
25 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
26 | #include <linux/sched.h> | ||
26 | #include <linux/idr.h> | 27 | #include <linux/idr.h> |
27 | 28 | ||
28 | #include "debug.h" | 29 | #include "debug.h" |