ARM: OMAP: Define interrupt register locally

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-omap / entry-macro.S

diff --git a/include/asm-arm/arch-omap/entry-macro.S b/include/asm-arm/arch-omap/entry-macro.S
index 5f5e254ed1825f59347cbf0785690db4fa55c4ea..5951fdb9f8ff91d5cd523a13d20b927958085aaa 100644 (file)
--- a/include/asm-arm/arch-omap/entry-macro.S
+++ b/include/asm-arm/arch-omap/entry-macro.S
@@ -8,6 +8,7 @@
  * warranty of any kind, whether express or implied.
  */
 #include <asm/hardware.h>
+#include <asm/arch/io.h>
 #include <asm/arch/irqs.h>
 
 #if defined(CONFIG_ARCH_OMAP1)
@@ -64,6 +65,8 @@
 #include <asm/arch/omap34xx.h>
 #endif
 
+#define INTCPS_SIR_IRQ_OFFSET  0x0040          /* Active interrupt number */
+
                .macro  disable_fiq
                .endm
 
@@ -84,7 +87,7 @@
                ldr     \irqnr, [\base, #0xd8] /* IRQ pending reg 3 */
                cmp     \irqnr, #0x0
 2222:
-               ldrne   \irqnr, [\base, #IRQ_SIR_IRQ]
+               ldrne   \irqnr, [\base, #INTCPS_SIR_IRQ_OFFSET]
 
                .endm