vserver 1.9.3

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

diff --git a/include/asm-ppc/ide.h b/include/asm-ppc/ide.h
index 1393d51..7d6e659 100644 (file)
--- a/include/asm-ppc/ide.h
+++ b/include/asm-ppc/ide.h
@@ -24,10 +24,10 @@
 #include <linux/ioport.h>
 #include <asm/io.h>
 
-extern void __ide_mm_insw(unsigned long port, void *addr, u32 count);
-extern void __ide_mm_outsw(unsigned long port, void *addr, u32 count);
-extern void __ide_mm_insl(unsigned long port, void *addr, u32 count);
-extern void __ide_mm_outsl(unsigned long port, void *addr, u32 count);
+extern void __ide_mm_insw(void __iomem *port, void *addr, u32 count);
+extern void __ide_mm_outsw(void __iomem *port, void *addr, u32 count);
+extern void __ide_mm_insl(void __iomem *port, void *addr, u32 count);
+extern void __ide_mm_outsl(void __iomem *port, void *addr, u32 count);
 
 struct ide_machdep_calls {
         int         (*default_irq)(unsigned long base);
@@ -43,6 +43,8 @@ extern struct ide_machdep_calls ppc_ide_md;
 #undef SUPPORT_SLOW_DATA_PORTS
 #define        SUPPORT_SLOW_DATA_PORTS 0
 
+#define IDE_ARCH_OBSOLETE_DEFAULTS
+
 static __inline__ int ide_default_irq(unsigned long base)
 {
        if (ppc_ide_md.default_irq)
@@ -57,6 +59,9 @@ static __inline__ unsigned long ide_default_io_base(int index)
        return 0;
 }
 
+#define IDE_ARCH_OBSOLETE_INIT
+#define ide_default_io_ctl(base)       ((base) + 0x206) /* obsolete */
+
 #ifdef CONFIG_PCI
 #define ide_init_default_irq(base)     (0)
 #else