summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorSundar Iyer <sundar.iyer@stericsson.com>2011-01-21 10:56:15 +0530
committerLinus Walleij <linus.walleij@linaro.org>2011-03-14 14:05:09 +0100
commit871056e7dfb6164ffd6c6665752f921f9d5c6a81 (patch)
tree4fa0aee629af8d0aad6eebb2cffbca1360449116 /arch/arm/mach-ux500
parentd1de85a23144e922a1f2971be74076020f340090 (diff)
downloadblackbird-obmc-linux-871056e7dfb6164ffd6c6665752f921f9d5c6a81.tar.gz
blackbird-obmc-linux-871056e7dfb6164ffd6c6665752f921f9d5c6a81.zip
mach-ux500: fix ux500 build error
Include ab8500 regulators for DB8500 SoC by default and fix build issues Signed-off-by: Sundar Iyer <sundar.iyer@stericsson.com> [Small fixup for changed boardfiles] Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/Makefile4
1 files changed, 2 insertions, 2 deletions
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
OpenPOWER on IntegriCloud