summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-versatile/Makefile
diff options
context:
space:
mode:
authorRussell King2011-01-18 21:26:08 +0100
committerRussell King2011-02-19 12:11:28 +0100
commitdc37c31bbfaf87118d6c827be0a38a512a40b741 (patch)
tree188741bec32c43d8a92c32e44420b5404744d261 /arch/arm/plat-versatile/Makefile
parentARM: realview: remove old AMBA device DMA definitions (diff)
downloadkernel-qcow2-linux-dc37c31bbfaf87118d6c827be0a38a512a40b741.tar.gz
kernel-qcow2-linux-dc37c31bbfaf87118d6c827be0a38a512a40b741.tar.xz
kernel-qcow2-linux-dc37c31bbfaf87118d6c827be0a38a512a40b741.zip
ARM: rationalize versatile family Kconfig/Makefile
Move leds and sched_clock build conditionals out of the Makefile into the Kconfig file. Move selection of HAVE_SCHED_CLOCK into the platform Kconfig rather than duplicating it three times in the main architecture Kconfig. 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/Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile
index 8b3341c11ee5..de6f42f003b3 100644
--- a/arch/arm/plat-versatile/Makefile
+++ b/arch/arm/plat-versatile/Makefile
@@ -1,9 +1,5 @@
obj-y := clock.o
-ifneq ($(CONFIG_ARCH_INTEGRATOR),y)
-obj-y += sched-clock.o
-endif
-ifeq ($(CONFIG_LEDS_CLASS),y)
-obj-$(CONFIG_ARCH_REALVIEW) += leds.o
-obj-$(CONFIG_ARCH_VERSATILE) += leds.o
-endif
obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o
+obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o
+obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o
+