Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-ux500 / Makefile

diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index 9e27a84433cbd27829e3099b120c39099bee56cf..53ebb429e9712c578274dcbe30e83be1d97535b7 100644 (file)
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -2,14 +2,17 @@
 # Makefile for the linux kernel, U8500 machine.
 #
 
-obj-y                          := clock.o cpu.o devices.o
-obj-$(CONFIG_UX500_SOC_DB5500) += cpu-db5500.o devices-db5500.o
+obj-y                          := clock.o cpu.o devices.o devices-common.o \
+                                  id.o
+obj-$(CONFIG_UX500_SOC_DB5500) += cpu-db5500.o dma-db5500.o
 obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o prcmu.o
-obj-$(CONFIG_MACH_U8500_MOP)   += board-mop500.o board-mop500-sdi.o
-obj-$(CONFIG_MACH_U5500)       += board-u5500.o
+obj-$(CONFIG_MACH_U8500)       += board-mop500.o board-mop500-sdi.o \
+                               board-mop500-keypads.o
+obj-$(CONFIG_MACH_U5500)       += board-u5500.o board-u5500-sdi.o
 obj-$(CONFIG_SMP)              += platsmp.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)      += hotplug.o
 obj-$(CONFIG_LOCAL_TIMERS)     += localtimer.o
 obj-$(CONFIG_REGULATOR_AB8500) += board-mop500-regulators.o
-obj-$(CONFIG_U5500_MODEM_IRQ)  += modem_irq.o
-obj-$(CONFIG_U5500_MBOX)       += mbox.o
+obj-$(CONFIG_U5500_MODEM_IRQ)  += modem-irq-db5500.o
+obj-$(CONFIG_U5500_MBOX)       += mbox-db5500.o
+obj-$(CONFIG_CPU_FREQ)         += cpufreq.o