vserver 2.0 rc7

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

diff --git a/include/asm-parisc/ide.h b/include/asm-parisc/ide.h
index 15a9374..3243cf2 100644 (file)
--- a/include/asm-parisc/ide.h
+++ b/include/asm-parisc/ide.h
@@ -13,8 +13,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
-
 #ifndef MAX_HWIFS
 #define MAX_HWIFS      2
 #endif
@@ -34,7 +32,7 @@
 #define __ide_outsw    outsw
 #define __ide_outsl    outsl
 
-static __inline__ void __ide_mm_insw(unsigned long port, void *addr, u32 count)
+static __inline__ void __ide_mm_insw(void __iomem *port, void *addr, u32 count)
 {
        while (count--) {
                *(u16 *)addr = __raw_readw(port);
@@ -42,7 +40,7 @@ static __inline__ void __ide_mm_insw(unsigned long port, void *addr, u32 count)
        }
 }
 
-static __inline__ void __ide_mm_insl(unsigned long port, void *addr, u32 count)
+static __inline__ void __ide_mm_insl(void __iomem *port, void *addr, u32 count)
 {
        while (count--) {
                *(u32 *)addr = __raw_readl(port);
@@ -50,7 +48,7 @@ static __inline__ void __ide_mm_insl(unsigned long port, void *addr, u32 count)
        }
 }
 
-static __inline__ void __ide_mm_outsw(unsigned long port, void *addr, u32 count)
+static __inline__ void __ide_mm_outsw(void __iomem *port, void *addr, u32 count)
 {
        while (count--) {
                __raw_writew(*(u16 *)addr, port);
@@ -58,7 +56,7 @@ static __inline__ void __ide_mm_outsw(unsigned long port, void *addr, u32 count)
        }
 }
 
-static __inline__ void __ide_mm_outsl(unsigned long port, void *addr, u32 count)
+static __inline__ void __ide_mm_outsl(void __iomem *port, void *addr, u32 count)
 {
        while (count--) {
                __raw_writel(*(u32 *)addr, port);