Merge to Fedora kernel-2.6.18-1.2260_FC5 patched with stable patch-2.6.18.5-vs2.0...

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

diff --git a/include/asm-ppc64/ide.h b/include/asm-ppc64/ide.h
index 88d3645..0aae1c5 100644 (file)
--- a/include/asm-ppc64/ide.h
+++ b/include/asm-ppc64/ide.h
@@ -19,13 +19,11 @@
 #ifdef __KERNEL__
 
 #ifndef MAX_HWIFS
-# define MAX_HWIFS     4
+# define MAX_HWIFS     10
 #endif
 
-static inline int ide_default_irq(unsigned long base) { return 0; }
-static inline unsigned long ide_default_io_base(int index) { return 0; }
-
-#define ide_init_default_irq(base)     (0)
+#define IDE_ARCH_OBSOLETE_INIT
+#define ide_default_io_ctl(base)       ((base) + 0x206) /* obsolete */
 
 #endif /* __KERNEL__ */