Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6] / fs / file_table.c

diff --git a/fs/file_table.c b/fs/file_table.c
index 6142250104a6dbdc2acd0a5eca5ad7263105785b..768b581675433ed0e02eb0a9bcf35288de7adca5 100644 (file)
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -16,6 +16,7 @@
 #include <linux/eventpoll.h>
 #include <linux/rcupdate.h>
 #include <linux/mount.h>
+#include <linux/capability.h>
 #include <linux/cdev.h>
 #include <linux/fsnotify.h>