Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

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

diff --git a/include/asm-sh64/ide.h b/include/asm-sh64/ide.h
index 852f50afe39cae1910815809c84834ae5b116b01..b6e31e8b941037a3a8a6ee6ff5a1362d91b2f2f1 100644 (file)
--- a/include/asm-sh64/ide.h
+++ b/include/asm-sh64/ide.h
@@ -15,12 +15,10 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 
 /* Without this, the initialisation of PCI IDE cards end up calling
  * ide_init_hwif_ports, which won't work. */
 #ifdef CONFIG_BLK_DEV_IDEPCI
-#define IDE_ARCH_OBSOLETE_INIT 1
 #define ide_default_io_ctl(base)       (0)
 #endif