Merge commit 'v2.6.34-rc6' into x86/cpu

[pandora-kernel.git] / mm / failslab.c

diff --git a/mm/failslab.c b/mm/failslab.c
index bb41f98..c5f88f2 100644 (file)
--- a/mm/failslab.c
+++ b/mm/failslab.c
@@ -1,5 +1,4 @@
 #include <linux/fault-inject.h>
-#include <linux/gfp.h>
 #include <linux/slab.h>
 
 static struct {