Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / arch / arm / mach-netx / include / mach / entry-macro.S

diff --git a/arch/arm/mach-netx/include/mach/entry-macro.S b/arch/arm/mach-netx/include/mach/entry-macro.S
index a1952a0..844f1f9 100644 (file)
--- a/arch/arm/mach-netx/include/mach/entry-macro.S
+++ b/arch/arm/mach-netx/include/mach/entry-macro.S
@@ -24,15 +24,13 @@
                .endm
 
                .macro  get_irqnr_preamble, base, tmp
+               ldr     \base, =io_p2v(0x001ff000)
                .endm
 
                .macro  arch_ret_to_user, tmp1, tmp2
                .endm
 
                .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-               mov     \base, #io_p2v(0x00100000)
-               add     \base, \base, #0x000ff000
-
                ldr     \irqstat, [\base, #0]
                clz     \irqnr, \irqstat
                rsb     \irqnr, \irqnr, #31