Merge commit 'origin/master'

[linux-2.6-omap-h63xx.git] / 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 6590f657500dc1c6e7b1d3cd5e6eec265471dacb..fb9c3627a5b4eac13c71f7fc3d919d456a18fcf1 100644 (file)
--- a/include/asm-cris/arch-v32/ide.h
+++ b/include/asm-cris/arch-v32/ide.h
@@ -48,13 +48,8 @@ static 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__ */