Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

[pandora-kernel.git] / arch / arm / mach-shmobile / Makefile

diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index d16165a..e2507f6 100644 (file)
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -11,6 +11,12 @@ obj-$(CONFIG_ARCH_SH7377)    += setup-sh7377.o clock-sh7377.o intc-sh7377.o
 obj-$(CONFIG_ARCH_SH7372)      += setup-sh7372.o clock-sh7372.o intc-sh7372.o
 obj-$(CONFIG_ARCH_SH73A0)      += setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o
 
+# SMP objects
+smp-y                          := platsmp.o headsmp.o
+smp-$(CONFIG_HOTPLUG_CPU)      += hotplug.o
+smp-$(CONFIG_LOCAL_TIMERS)     += localtimer.o
+smp-$(CONFIG_ARCH_SH73A0)      += smp-sh73a0.o
+
 # Pinmux setup
 pfc-y                          :=
 pfc-$(CONFIG_ARCH_SH7367)      += pfc-sh7367.o
@@ -32,4 +38,5 @@ obj-$(CONFIG_MACH_AG5EVM)     += board-ag5evm.o
 obj-$(CONFIG_MACH_MACKEREL)    += board-mackerel.o
 
 # Framework support
+obj-$(CONFIG_SMP)              += $(smp-y)
 obj-$(CONFIG_GENERIC_GPIO)     += $(pfc-y)