diff --git a/[refs] b/[refs]
index 31d61b7ebfe1..a40f2495f994 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9d6b3358ac35901ccc6a4a5a317670fa469db25
+refs/heads/master: 909444ab20629ebc4478642b660a391700aa7e33
diff --git a/trunk/arch/arm/mach-tegra/platsmp.c b/trunk/arch/arm/mach-tegra/platsmp.c
index 79fa7857d68d..8127d766fcfa 100644
--- a/trunk/arch/arm/mach-tegra/platsmp.c
+++ b/trunk/arch/arm/mach-tegra/platsmp.c
@@ -36,8 +36,6 @@
 
 extern void tegra_secondary_startup(void);
 
-static void __iomem *scu_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE);
-
 #define EVP_CPU_RESET_VECTOR \
 	(IO_ADDRESS(TEGRA_EXCEPTION_VECTORS_BASE) + 0x100)
 
@@ -151,7 +149,8 @@ static void __init tegra_smp_init_cpus(void)
 static void __init tegra_smp_prepare_cpus(unsigned int max_cpus)
 {
 	tegra_cpu_reset_handler_init();
-	scu_enable(scu_base);
+	if (scu_a9_has_base())
+		scu_enable(IO_ADDRESS(scu_a9_get_base()));
 }
 
 struct smp_operations tegra_smp_ops __initdata = {