diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:42:23 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:42:23 +0100 |
| commit | eed1e576507b52e03e549e0c9e0c747978122403 (patch) | |
| tree | 69a7ecac041f83b0299f55a760f4f0cd5767ae05 /arch/arm/mach-ux500/Makefile | |
| parent | Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer (diff) | |
| parent | mach-ux500: remove pull-pinconfig and add SPI2 (diff) | |
| download | linux-eed1e576507b52e03e549e0c9e0c747978122403.tar.xz linux-eed1e576507b52e03e549e0c9e0c747978122403.zip | |
Merge branch 'stericsson/cleanup' into next/timer
The timer and cleanup branches from stericsson conflict,
so I'm merging them here.
Conflicts:
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/cpu.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ux500/Makefile')
| -rw-r--r-- | arch/arm/mach-ux500/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index be915a1ac404..6bd2f451c185 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -4,6 +4,7 @@ obj-y := clock.o cpu.o devices.o devices-common.o \ id.o usb.o timer.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 \ |