summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/Makefile
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-02-29 21:15:20 +0400
committerLinus Walleij <linus.walleij@linaro.org>2012-02-29 21:31:18 +0400
commit5017f1cd9b980c3975d25ca530a578281e91aa04 (patch)
tree5d81d17bf7307d70f4d24badb1b6ecbe38cf9e1a /arch/arm/mach-ux500/Makefile
parent382bd12528777be5236acf0a19e016aebfc9a34a (diff)
downloadlinux-5017f1cd9b980c3975d25ca530a578281e91aa04.tar.xz
ARM: ux500: solve some Kconfig mess
First rename the config option MACH_U8500 to MACH_MOP500 because that is what it's obviously all about, this has confused me for the last time. Fix some whitespace in the process. Since the machine descriptors for HREFv60 and snowball are clearly in the file board-mop500.c which only compiles if MACH_MOP500 (former MACH_U8500) is set, select this for the board variants and nothing else. For the MOP500 variants the UIB (user interface board) is probed using I2C so select I2C and I2C_NOMADIK so we know that this probe will always be successful. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/Makefile')
-rw-r--r--arch/arm/mach-ux500/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index 6bd2f451c185..8dd75f210d2b 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -7,7 +7,7 @@ obj-y := clock.o cpu.o devices.o devices-common.o \
obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o
obj-$(CONFIG_UX500_SOC_DB5500) += cpu-db5500.o dma-db5500.o
obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o
-obj-$(CONFIG_MACH_U8500) += board-mop500.o board-mop500-sdi.o \
+obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \
board-mop500-regulators.o \
board-mop500-uib.o board-mop500-stuib.o \
board-mop500-u8500uib.o \