vserver 1.9.3

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

diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h
index 9ce42e1..6b32740 100644 (file)
--- a/include/asm-sparc64/ide.h
+++ b/include/asm-sparc64/ide.h
@@ -24,17 +24,8 @@
 # endif
 #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 */
 
 #define __ide_insl(data_reg, buffer, wcount) \
        __ide_insw(data_reg, buffer, (wcount)<<1)
@@ -47,7 +38,7 @@ static __inline__ unsigned long ide_default_io_base(int index)
 #define __ide_mm_outsw __ide_outsw
 #define __ide_mm_outsl __ide_outsl
 
-static __inline__ unsigned int inw_be(unsigned long addr)
+static inline unsigned int inw_be(void __iomem *addr)
 {
        unsigned int ret;
 
@@ -58,9 +49,7 @@ static __inline__ unsigned int inw_be(unsigned long addr)
        return ret;
 }
 
-static __inline__ void __ide_insw(unsigned long port,
-                                 void *dst,
-                                 u32 count)
+static inline void __ide_insw(void __iomem *port, void *dst, u32 count)
 {
 #if (L1DCACHE_SIZE > PAGE_SIZE)                /* is there D$ aliasing problem */
        unsigned long end = (unsigned long)dst + (count << 1);
@@ -90,16 +79,14 @@ static __inline__ void __ide_insw(unsigned long port,
 #endif
 }
 
-static __inline__ void outw_be(unsigned short w, unsigned long addr)
+static inline void outw_be(unsigned short w, void __iomem *addr)
 {
        __asm__ __volatile__("stha %0, [%1] %2"
                             : /* no outputs */
                             : "r" (w), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
 }
 
-static __inline__ void __ide_outsw(unsigned long port,
-                                  void *src,
-                                  u32 count)
+static inline void __ide_outsw(void __iomem *port, void *src, u32 count)
 {
 #if (L1DCACHE_SIZE > PAGE_SIZE)                /* is there D$ aliasing problem */
        unsigned long end = (unsigned long)src + (count << 1);