Merge branches 'omap1-upstream' and 'omap2-upstream' into devel

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

diff --git a/include/asm-sh/ide.h b/include/asm-sh/ide.h
index f42cf3977a5748890a1721f4b5ce64a45658e9d2..9f8e9142dc33b68ff8f737682ff5d8ac16d5ca84 100644 (file)
--- a/include/asm-sh/ide.h
+++ b/include/asm-sh/ide.h
@@ -14,11 +14,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
-
-#ifndef MAX_HWIFS
-#define MAX_HWIFS      CONFIG_IDE_MAX_HWIFS
-#endif
 
 #define ide_default_io_ctl(base)       (0)