diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-19 05:07:38 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-19 06:11:36 -0500 |
| commit | cdab142a80d859984eb5e3876e0e762b1f0bded9 (patch) | |
| tree | 85f212da3ef394d2c25c343ee5fd911f6d4695f2 /arch/arm/plat-versatile/Makefile | |
| parent | c41b16f8c9d9dc74ed5669d4a3e3d42374c9e609 (diff) | |
ARM: realview/vexpress: consolidate localtimer support
Realview and Versatile Express local timer support is identical, so
consolidate the implementations.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-versatile/Makefile')
| -rw-r--r-- | arch/arm/plat-versatile/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile index 41f57f4b9038..b511abb10198 100644 --- a/arch/arm/plat-versatile/Makefile +++ b/arch/arm/plat-versatile/Makefile | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | obj-y := clock.o | 1 | obj-y := clock.o |
| 2 | obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o | ||
| 2 | obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o | 3 | obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o |
| 3 | obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o | 4 | obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o |
| 4 | obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o | 5 | obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o |