Merge branches 'release' and 'hp-cid' into release

[linux-2.6] / include / asm-cris / arch-v32 / ide.h

diff --git a/include/asm-cris/arch-v32/ide.h b/include/asm-cris/arch-v32/ide.h
index 24f5604f566ac28b780d7daa87c44532c7beae3e..fb9c3627a5b4eac13c71f7fc3d919d456a18fcf1 100644 (file)
--- a/include/asm-cris/arch-v32/ide.h
+++ b/include/asm-cris/arch-v32/ide.h
@@ -26,7 +26,7 @@
 
 #define MAX_HWIFS      4
 
-extern __inline__ int ide_default_irq(unsigned long base)
+static inline int ide_default_irq(unsigned long base)
 {
        /* all IDE busses share the same IRQ,
         * this has the side-effect that ide-probe.c will cluster our 4 interfaces
@@ -36,7 +36,7 @@ extern __inline__ int ide_default_irq(unsigned long base)
        return ATA_INTR_VECT;
 }
 
-extern __inline__ unsigned long ide_default_io_base(int index)
+static inline unsigned long ide_default_io_base(int index)
 {
        reg_ata_rw_ctrl2 ctrl2 = {.sel = index};
        /* we have no real I/O base address per interface, since all go through the
@@ -48,13 +48,8 @@ extern __inline__ unsigned long ide_default_io_base(int index)
        return REG_TYPE_CONV(unsigned long, reg_ata_rw_ctrl2, ctrl2);
 }
 
-/* some configuration options we don't need */
-
-#undef SUPPORT_VLB_SYNC
-#define SUPPORT_VLB_SYNC 0
-
 #define IDE_ARCH_ACK_INTR
-#define ide_ack_intr(hwif)     (hwif)->hw.ack_intr(hwif)
+#define ide_ack_intr(hwif)     ((hwif)->ack_intr(hwif))
 
 #endif /* __KERNEL__ */