[PATCH] asm-ia64/ide.h: use unsigned long instead of ide_ioreg_t

diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h
index 26c3259018ba68bd9e8f5ac6717a67172d9fc72d..fbe88e3fc2308696359ac6b959c28f0e65cfd5db 100644 (file)
--- a/include/asm-ia64/ide.h
+++ b/include/asm-ia64/ide.h
@@ -25,8 +25,7 @@
 # endif
 #endif
 
-static __inline__ int
-ide_default_irq (ide_ioreg_t base)
+static inline int ide_default_irq(unsigned long base)
 {
        switch (base) {
              case 0x1f0: return isa_irq_to_vector(14);
@@ -40,8 +39,7 @@ ide_default_irq (ide_ioreg_t base)
        }
 }
 
-static __inline__ ide_ioreg_t
-ide_default_io_base (int index)
+static inline unsigned long ide_default_io_base(int index)
 {
        switch (index) {
              case 0: return 0x1f0;
@@ -55,10 +53,10 @@ ide_default_io_base (int index)
        }
 }
 
-static __inline__ void
-ide_init_hwif_ports (hw_regs_t *hw, ide_ioreg_t data_port, ide_ioreg_t ctrl_port, int *irq)
+static inline void ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
+                                      unsigned long ctrl_port, int *irq)
 {
-       ide_ioreg_t reg = data_port;
+       unsigned long reg = data_port;
        int i;
 
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {