vserver 2.0 rc7

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

diff --git a/include/asm-sh64/ide.h b/include/asm-sh64/ide.h
index 900315a..6fd514d 100644 (file)
--- a/include/asm-sh64/ide.h
+++ b/include/asm-sh64/ide.h
@@ -21,7 +21,12 @@
 #define MAX_HWIFS      CONFIG_IDE_MAX_HWIFS
 #endif
 
+/* 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
 
 #include <asm-generic/ide_iops.h>