Wow. Fix those irq #defines for ARM and use the right one in power-c200_e200.c. How'd that happen?

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17010 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 5 insertions, 5 deletions

diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c
index 6b3f295e07..ade3a0c63b 100644
--- a/firmware/target/arm/sandisk/power-c200_e200.c
+++ b/firmware/target/arm/sandisk/power-c200_e200.c
@@ -38,7 +38,7 @@ void power_off(void)
     pp_i2c_send(AS3514_I2C_ADDR, SYSTEM, byte);
 
     /* Stop interrupts on both cores */
-    disable_irq(IRQ_FIQ_STATUS);
+    disable_interrupt(IRQ_FIQ_STATUS);
     COP_INT_CLR = -1;
     CPU_INT_CLR = -1;
 
diff --git a/firmware/target/arm/system-arm.h b/firmware/target/arm/system-arm.h
index 3f1dfb16c8..5627475408 100644
--- a/firmware/target/arm/system-arm.h
+++ b/firmware/target/arm/system-arm.h
@@ -131,16 +131,16 @@ static inline void disable_interrupt(int mask)
         : "=&r"(tmp) : "i"(mask));
 }
 
-#define disable_irq(void) \
+#define disable_irq() \
     disable_interrupt(IRQ_STATUS)
 
-#define enable_irq(void) \
+#define enable_irq() \
     enable_interrupt(IRQ_STATUS)
 
-#define disable_fiq(void) \
+#define disable_fiq() \
     disable_interrupt(FIQ_STATUS)
 
-#define enable_fiq(void) \
+#define enable_fiq() \
     enable_interrupt(FIQ_STATUS)
 
 static inline int disable_interrupt_save(int mask)