Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / arch / arm / mach-at91rm9200 / pm.c

diff --git a/arch/arm/mach-at91rm9200/pm.c b/arch/arm/mach-at91rm9200/pm.c
index 47e5480feb7eef279a6c5a8b5a748b7f4c1dee19..32c95d8eaacf3dabe0866f9603104534b43839eb 100644 (file)
--- a/arch/arm/mach-at91rm9200/pm.c
+++ b/arch/arm/mach-at91rm9200/pm.c
@@ -123,13 +123,13 @@ static int at91_pm_enter(suspend_state_t state)
                        (at91_sys_read(AT91_PMC_PCSR)
                                        | (1 << AT91_ID_FIQ)
                                        | (1 << AT91_ID_SYS)
-                                       | (1 << AT91_ID_IRQ0)
-                                       | (1 << AT91_ID_IRQ1)
-                                       | (1 << AT91_ID_IRQ2)
-                                       | (1 << AT91_ID_IRQ3)
-                                       | (1 << AT91_ID_IRQ4)
-                                       | (1 << AT91_ID_IRQ5)
-                                       | (1 << AT91_ID_IRQ6))
+                                       | (1 << AT91RM9200_ID_IRQ0)
+                                       | (1 << AT91RM9200_ID_IRQ1)
+                                       | (1 << AT91RM9200_ID_IRQ2)
+                                       | (1 << AT91RM9200_ID_IRQ3)
+                                       | (1 << AT91RM9200_ID_IRQ4)
+                                       | (1 << AT91RM9200_ID_IRQ5)
+                                       | (1 << AT91RM9200_ID_IRQ6))
                                & at91_sys_read(AT91_AIC_IMR),
                        state);