[ARM] 4819/1: RealView: Fix entry-macro.S to work with multiple platforms

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

diff --git a/include/asm-arm/arch-realview/entry-macro.S b/include/asm-arm/arch-realview/entry-macro.S
index 629944deed504305066814ce50cb78deb2eb8472..cd26306d8e57f8d2ecff1361ece23315485473d8 100644 (file)
--- a/include/asm-arm/arch-realview/entry-macro.S
+++ b/include/asm-arm/arch-realview/entry-macro.S
@@ -9,17 +9,13 @@
  */
 #include <asm/hardware.h>
 #include <asm/hardware/gic.h>
-#include <asm/arch/board-eb.h>
 
                .macro  disable_fiq
                .endm
 
                .macro  get_irqnr_preamble, base, tmp
-#ifdef CONFIG_REALVIEW_MPCORE
-               ldr     \base, =IO_ADDRESS(REALVIEW_EB11MP_GIC_CPU_BASE)
-#else
-               ldr     \base, =IO_ADDRESS(REALVIEW_GIC_CPU_BASE)
-#endif
+               ldr     \base, =gic_cpu_base_addr
+               ldr     \base, [\base]
                .endm
 
                .macro  arch_ret_to_user, tmp1, tmp2