Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / fs / compat.c

diff --git a/fs/compat.c b/fs/compat.c
index 8d0a0018a7d2cfc934934a992e98bcfabf45755c..06dad665b88fce8f412dc10303a527fefeb2278a 100644 (file)
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -45,6 +45,8 @@
 #include <linux/personality.h>
 #include <linux/rwsem.h>
 #include <linux/tsacct_kern.h>
+#include <linux/highmem.h>
+#include <linux/poll.h>
 #include <linux/mm.h>
 
 #include <net/sock.h>          /* siocdevprivate_ioctl */