3 files changed, 5 insertions, 4 deletions

diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c
index 4f87b4d09c7d..60500f0b878d 100644
--- a/arch/arm/mach-realview/localtimer.c
+++ b/arch/arm/mach-realview/localtimer.c
@@ -24,8 +24,8 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#define TWD_BASE(cpu)   (__io_address(REALVIEW_TWD_BASE) + \
-                         ((cpu) * REALVIEW_TWD_SIZE))
+#define TWD_BASE(cpu)   (__io_address(REALVIEW_EB11MP_TWD_BASE) + \
+                         ((cpu) * REALVIEW_EB11MP_TWD_SIZE))
 
 static DEFINE_PER_CPU(struct clock_event_device, local_clockevent);
 
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index bb5eaa48520d..0186c80c9040 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -31,7 +31,7 @@ static unsigned int __init get_core_count(void)
 {
         unsigned int ncores;
 
-        ncores = __raw_readl(__io_address(REALVIEW_MPCORE_SCU_BASE) + SCU_CONFIG);
+        ncores = __raw_readl(__io_address(REALVIEW_EB11MP_SCU_BASE) + SCU_CONFIG);
 
         return (ncores & 0x03) + 1;
 }
@@ -52,7 +52,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu)
          * core (e.g. timer irq), then they will not have been enabled
          * for us: do so
          */
-        gic_cpu_init(0, __io_address(REALVIEW_GIC_CPU_BASE));
+        gic_cpu_init(0, __io_address(REALVIEW_EB11MP_GIC_CPU_BASE));
 
         /*
          * let the primary processor know we're out of the
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index ecec2f85c4cd..9c992568ee40 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -37,6 +37,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/mmc.h>
 
+#include <asm/arch/board-eb.h>
 #include <asm/arch/irqs.h>
 
 #include "core.h"