Merge with /home/shaggy/git/linus-clean/

[linux-2.6] / fs / udf / file.c

diff --git a/fs/udf/file.c b/fs/udf/file.c
index 8a388289040dbb66de764c8ccc92fdade27253eb..a6f2acc1f15c01929dd0ecc48a93b6c00e981d11 100644 (file)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -31,6 +31,7 @@
 #include <asm/uaccess.h>
 #include <linux/kernel.h>
 #include <linux/string.h> /* memset */
+#include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/smp_lock.h>
 #include <linux/pagemap.h>