Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux

[safe/jmp/linux-2.6] / mm / bounce.c

diff --git a/mm/bounce.c b/mm/bounce.c
index 4ebe3ea..13b6dad 100644 (file)
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -6,6 +6,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/swap.h>
+#include <linux/gfp.h>
 #include <linux/bio.h>
 #include <linux/pagemap.h>
 #include <linux/mempool.h>
@@ -13,7 +14,6 @@
 #include <linux/init.h>
 #include <linux/hash.h>
 #include <linux/highmem.h>
-#include <linux/blktrace_api.h>
 #include <asm/tlbflush.h>
 
 #include <trace/events/block.h>