Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[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..852f50a 100644 (file)
--- a/include/asm-sh64/ide.h
+++ b/include/asm-sh64/ide.h
@@ -17,11 +17,12 @@
 
 #include <linux/config.h>
 
-#ifndef MAX_HWIFS
-#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>