Merge tag 'for-linus-20130509' of git://git.infradead.org/~dwmw2/random-2.6

[karo-tx-linux.git] / arch / arm / mach-spear / Makefile

diff --git a/arch/arm/mach-spear/Makefile b/arch/arm/mach-spear/Makefile
index af9bffb94f1cd07c2f5648f21d8a969e634ff61e..a946c19ab31a5db0a2f2766d9f68fc996175ff6e 100644 (file)
--- a/arch/arm/mach-spear/Makefile
+++ b/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