Merge branch 'master' into export-slabh

[linux-2.6-block.git] / arch / x86 / mm / init.c

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 452ee5b8f30909fae2da150dcbd3cf4eaa67fa08..b278535b14aa00ce5b46de5e5bdd01cc75dc0c8a 100644 (file)
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -1,3 +1,4 @@
+#include <linux/gfp.h>
 #include <linux/initrd.h>
 #include <linux/ioport.h>
 #include <linux/swap.h>