fedora core 6 1.2949 + vserver 2.2.0

[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..c9d84d5 100644 (file)
--- a/include/asm-sh64/ide.h
+++ b/include/asm-sh64/ide.h
@@ -15,13 +15,13 @@
 
 #ifdef __KERNEL__
 
-#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>