diff --git a/[refs] b/[refs]
index 23ffa1be1f8a..756a886c9335 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b45e0ed41adee52c49c222e752495d69d7e57981
+refs/heads/master: a94d236dc355f374857ee4e6e78b7dec8a0f29e3
diff --git a/trunk/arch/arm/mach-spear/Makefile b/trunk/arch/arm/mach-spear/Makefile
index dc9ce80508ad..8aaf724e1ea4 100644
--- a/trunk/arch/arm/mach-spear/Makefile
+++ b/trunk/arch/arm/mach-spear/Makefile
@@ -7,10 +7,10 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
 # Common support
 obj-y	:= restart.o time.o
 
-obj-$(CONFIG_SMP)		+= headsmp.o platsmp.o
-obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
+smp-$(CONFIG_SMP)		+= headsmp.o platsmp.o
+smp-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
 
-obj-$(CONFIG_ARCH_SPEAR13XX)	+= spear13xx.o
+obj-$(CONFIG_ARCH_SPEAR13XX)	+= spear13xx.o $(smp-y)
 obj-$(CONFIG_MACH_SPEAR1310)	+= spear1310.o
 obj-$(CONFIG_MACH_SPEAR1340)	+= spear1340.o