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

[linux-2.6-omap-h63xx.git] / include / asm-frv / ide.h

diff --git a/include/asm-frv/ide.h b/include/asm-frv/ide.h
index ae031eaa3dd2a05705fca170524ec3cedad996c5..f0bd2cb250c110ca64c353dfae02f054a22d9395 100644 (file)
--- a/include/asm-frv/ide.h
+++ b/include/asm-frv/ide.h
@@ -14,7 +14,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 #include <asm/setup.h>
 #include <asm/io.h>
 #include <asm/irq.h>