Merge branches 'release' and 'wmi-2.6.25' into release

[sfrench/cifs-2.6.git] / arch / blackfin / mach-common / Makefile

diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile
index 4d7733dfd5de009522fc203a4c7e884d8c2bcd5f..8636d4284bdb30b6f378c83e5e932acdaff245b0 100644 (file)
--- a/arch/blackfin/mach-common/Makefile
+++ b/arch/blackfin/mach-common/Makefile
@@ -3,10 +3,9 @@
 #
 
 obj-y := \
-       cache.o cacheinit.o cplbhdlr.o cplbmgr.o entry.o \
+       cache.o cacheinit.o entry.o \
        interrupt.o lock.o irqpanic.o arch_checks.o
 
-obj-$(CONFIG_CPLB_INFO)          += cplbinfo.o
 obj-$(CONFIG_BFIN_SINGLE_CORE)   += ints-priority-sc.o
 obj-$(CONFIG_BFIN_DUAL_CORE)     += ints-priority-dc.o
 obj-$(CONFIG_PM)                 += pm.o dpmc.o