Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (130 commits)
  [ARM] 3856/1: Add clocksource for Intel IXP4xx platforms
  [ARM] 3855/1: Add generic time support
  [ARM] 3873/1: S3C24XX: Add irq_chip names
  [ARM] 3872/1: S3C24XX: Apply consistant tabbing to irq_chips
  [ARM] 3871/1: S3C24XX: Fix ordering of EINT4..23
  [ARM] nommu: confirms the CR_V bit in nommu mode
  [ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.
  [ARM] 3870/1: AT91: Start removing static memory mappings
  [ARM] 3869/1: AT91: NAND support for DK and KB9202 boards
  [ARM] 3868/1: AT91 hardware header update
  [ARM] 3867/1: AT91 GPIO update
  [ARM] 3866/1: AT91 clock update
  [ARM] 3865/1: AT91RM9200 header updates
  [ARM] 3862/2: S3C2410 - add basic power management support for AML M5900 series
  [ARM] kthread: switch arch/arm/kernel/apm.c
  [ARM] Off-by-one in arch/arm/common/icst*
  [ARM] 3864/1: Refactore sharpsl_pm
  [ARM] 3863/1: Add Locomo SPI Device
  [ARM] 3847/2:  Convert LOMOMO to use struct device for GPIOs
  [ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-at91rm9200/pm.c b/arch/arm/mach-at91rm9200/pm.c
index 47e5480feb7e..32c95d8eaacf 100644
--- 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);