Merge Btrfs into fs/btrfs

[linux-2.6-omap-h63xx.git] / arch / frv / mm / dma-alloc.c

diff --git a/arch/frv/mm/dma-alloc.c b/arch/frv/mm/dma-alloc.c
index 636b2f8b5d981934e2b1a99635ae397d0779d7de..dc6522c464d4719d3f72558127cd654840ae035d 100644 (file)
--- a/arch/frv/mm/dma-alloc.c
+++ b/arch/frv/mm/dma-alloc.c
@@ -21,7 +21,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/signal.h>
 #include <linux/sched.h>