Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[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..b27bf7a 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
@@ -24,7 +22,6 @@
 
 #define ide_request_irq(irq,hand,flg,dev,id)   request_irq((irq),(hand),(flg),(dev),(id))
 #define ide_free_irq(irq,dev_id)               free_irq((irq), (dev_id))
-#define ide_check_region(from,extent)          check_region((from), (extent))
 #define ide_request_region(from,extent,name)   request_region((from), (extent), (name))
 #define ide_release_region(from,extent)                release_region((from), (extent))
 /* Generic I/O and MEMIO string operations.  */
@@ -34,7 +31,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 +39,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 +47,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 +55,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);