Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[~andy/linux] / include / asm-frv / dma.h

diff --git a/include/asm-frv/dma.h b/include/asm-frv/dma.h
index d8f9a2f21521e36ac27c4cde3b06a90107ec4a72..18d6bb8f84fcb0543f0b3f3b6c93d68aba215b31 100644 (file)
--- a/include/asm-frv/dma.h
+++ b/include/asm-frv/dma.h
@@ -14,7 +14,6 @@
 
 //#define DMA_DEBUG 1
 
-#include <linux/config.h>
 #include <linux/interrupt.h>
 
 #undef MAX_DMA_CHANNELS                /* don't use kernel/dma.c */