X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-sh64%2Fide.h;h=c9d84d5f772edbe1eb2554135d659fb83598e41e;hb=refs%2Fheads%2Fvserver;hp=900315ac40547757d1bfb78897b33364d9732578;hpb=5fc42a6ed0ec81088c37caadb45898ae6cd0ad2c;p=linux-2.6.git

diff --git a/include/asm-sh64/ide.h b/include/asm-sh64/ide.h
index 900315ac4..c9d84d5f7 100644
--- 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>