Merge "msm: platsmp: Initialize headswitches for secondary CPUs" into msm-3.4
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 28b7748..b2d3dfa 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -14,6 +14,7 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/io.h>
+#include <linux/regulator/krait-regulator.h>
#include <asm/hardware/gic.h>
#include <asm/cacheflush.h>
@@ -126,6 +127,8 @@
if (!base_ptr)
return -ENODEV;
+ secondary_cpu_hs_init(base_ptr);
+
writel_relaxed(0x021, base_ptr+0x04);
mb();
udelay(2);