Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / arch / arm / mach-zynq / Makefile

diff --git a/arch/arm/mach-zynq/Makefile b/arch/arm/mach-zynq/Makefile
index 1b25d92..c85fb3f 100644 (file)
--- a/arch/arm/mach-zynq/Makefile
+++ b/arch/arm/mach-zynq/Makefile
@@ -3,8 +3,7 @@
 #
 
 # Common support
-obj-y                          := common.o slcr.o
+obj-y                          := common.o slcr.o pm.o
 CFLAGS_REMOVE_hotplug.o                =-march=armv6k
 CFLAGS_hotplug.o               =-Wa,-march=armv7-a -mcpu=cortex-a9
-obj-$(CONFIG_HOTPLUG_CPU)      += hotplug.o
 obj-$(CONFIG_SMP)              += headsmp.o platsmp.o