From 871056e7dfb6164ffd6c6665752f921f9d5c6a81 Mon Sep 17 00:00:00 2001 From: Sundar Iyer Date: Fri, 21 Jan 2011 10:56:15 +0530 Subject: mach-ux500: fix ux500 build error Include ab8500 regulators for DB8500 SoC by default and fix build issues Signed-off-by: Sundar Iyer [Small fixup for changed boardfiles] Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-ux500') diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 53ebb429e971..0352272dc600 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -7,12 +7,12 @@ obj-y := clock.o cpu.o devices.o devices-common.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) += board-mop500.o board-mop500-sdi.o \ - board-mop500-keypads.o + board-mop500-keypads.o \ + board-mop500-regulators.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-db5500.o obj-$(CONFIG_U5500_MBOX) += mbox-db5500.o obj-$(CONFIG_CPU_FREQ) += cpufreq.o -- cgit v1.2.1