From 6e7ae88378bef80fcbf368dff90587becee257c5 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 15 Feb 2010 09:27:25 -0800 Subject: [PATCH] --- yaml --- r: 184685 b: refs/heads/master c: be8f317740f218bda59cc5ae5aefcdd7a333762a h: refs/heads/master i: 184683: eebb462eeef0e40bff2a242dd8bdda609804bf21 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/include/mach/entry-macro.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6253f0a178c3..c071b0886406 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95d2b4e9cbba4c9a2ac63205e846e7ccfebe69b4 +refs/heads/master: be8f317740f218bda59cc5ae5aefcdd7a333762a diff --git a/trunk/arch/arm/mach-omap2/include/mach/entry-macro.S b/trunk/arch/arm/mach-omap2/include/mach/entry-macro.S index 3e63aaabebe7..101ed79deec4 100644 --- a/trunk/arch/arm/mach-omap2/include/mach/entry-macro.S +++ b/trunk/arch/arm/mach-omap2/include/mach/entry-macro.S @@ -92,6 +92,7 @@ omap_irq_base: .word 0 #ifdef CONFIG_ARCH_OMAP4 .macro get_irqnr_preamble, base, tmp + ldr \base, =OMAP4_IRQ_BASE .endm /* @@ -114,7 +115,6 @@ omap_irq_base: .word 0 * valid range for an IRQ (30-1020 inclusive). */ .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - ldr \base, =OMAP4_IRQ_BASE ldr \irqstat, [\base, #GIC_CPU_INTACK] ldr \tmp, =1021