[ARM PATCH] 1902/1: OMAP update 1/3: entry-armv.S

Patch from Tony Lindgren

Update the IO register names in entry-armv.S

arch/arm/kernel/entry-armv.S

@@ -679,19 +679,19 @@ ENTRY(soft_irq_mask)
 
 		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
 		ldr	\base, =IO_ADDRESS(OMAP_IH1_BASE)
-		ldr	\irqnr, [\base, #IRQ_ITR]
-		ldr	\tmp, [\base, #IRQ_MIR]
+		ldr	\irqnr, [\base, #IRQ_ITR_REG_OFFSET]
+		ldr	\tmp, [\base, #IRQ_MIR_REG_OFFSET]
 		mov	\irqstat, #0xffffffff
 		bic	\tmp, \irqstat, \tmp
 		tst	\irqnr, \tmp
 		beq	1510f
 
-		ldr	\irqnr, [\base, #IRQ_SIR_FIQ]
+		ldr	\irqnr, [\base, #IRQ_SIR_FIQ_REG_OFFSET]
 		cmp	\irqnr, #0
-		ldreq	\irqnr, [\base, #IRQ_SIR_IRQ]
+		ldreq	\irqnr, [\base, #IRQ_SIR_IRQ_REG_OFFSET]
 		cmpeq	\irqnr, #INT_IH2_IRQ
 		ldreq	\base, =IO_ADDRESS(OMAP_IH2_BASE)
-		ldreq	\irqnr, [\base, #IRQ_SIR_IRQ]
+		ldreq	\irqnr, [\base, #IRQ_SIR_IRQ_REG_OFFSET]
 		addeqs	\irqnr, \irqnr, #32
 1510:
 		.endm