Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/kernel/smp.c
	arch/arm/mach-realview/Makefile
	arch/arm/mach-realview/platsmp.c

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index ca742172ea78..ac0e83f1cc3a 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -23,6 +23,7 @@
 
 #include <mach/board-eb.h>
 #include <mach/board-pb11mp.h>
+#include <mach/board-pbx.h>
 #include <asm/smp_scu.h>
 
 #include "core.h"
@@ -41,6 +42,9 @@ static void __iomem *scu_base_addr(void)
                 return __io_address(REALVIEW_EB11MP_SCU_BASE);
         else if (machine_is_realview_pb11mp())
                 return __io_address(REALVIEW_TC11MP_SCU_BASE);
+        else if (machine_is_realview_pbx() &&
+                 (core_tile_pbx11mp() || core_tile_pbxa9mp()))
+                return __io_address(REALVIEW_PBX_TILE_SCU_BASE);
         else
                 return (void __iomem *)0;
 }