Merge branch 'next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/power...

[linux-2.6-omap-h63xx.git] / arch / blackfin / mach-common / Makefile

diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile
index 393081e9b6804316b4d61c6d4f25ef9fbe13bb3d..e6ed57c56d4b7ef1d46d59f0809862e97dbfe2ea 100644 (file)
--- a/arch/blackfin/mach-common/Makefile
+++ b/arch/blackfin/mach-common/Makefile
@@ -3,8 +3,10 @@
 #
 
 obj-y := \
-       cache.o cacheinit.o entry.o \
-       interrupt.o lock.o irqpanic.o arch_checks.o ints-priority.o
+       cache.o entry.o head.o \
+       interrupt.o irqpanic.o arch_checks.o ints-priority.o
 
-obj-$(CONFIG_PM)         += pm.o dpmc.o
-obj-$(CONFIG_CPU_FREQ)   += cpufreq.o
+obj-$(CONFIG_BFIN_ICACHE_LOCK) += lock.o
+obj-$(CONFIG_PM)          += pm.o dpmc_modes.o
+obj-$(CONFIG_CPU_FREQ)    += cpufreq.o
+obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o