Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/include/asm-sh64/ide.h b/include/asm-sh64/ide.h
index c9d84d5f772edbe1eb2554135d659fb83598e41e..b6e31e8b941037a3a8a6ee6ff5a1362d91b2f2f1 100644 (file)
--- a/include/asm-sh64/ide.h
+++ b/include/asm-sh64/ide.h
@@ -19,7 +19,6 @@
 /* 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