Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp

[linux-2.6] / fs / ioctl.c

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 569209181425d20f5860c80b3a6dbfb92db4919b..f8aeec3ca10c20985146e292023e5554b2290765 100644 (file)
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -8,6 +8,7 @@
 #include <linux/syscalls.h>
 #include <linux/mm.h>
 #include <linux/smp_lock.h>
+#include <linux/capability.h>
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/security.h>