From 8e322f65b49b7d2f85f8226a2527c72d57a23b20 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Fri, 23 Jul 2010 11:49:52 +0100 Subject: [PATCH] --- yaml --- r: 201469 b: refs/heads/master c: b042245fc2ca8c0326f3f1ea6c4dafc561bb3a82 h: refs/heads/master i: 201467: 3feceb8905fbb1f1822cc0722143d484536c79b0 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-versatile/Makefile | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5bcd46925eb1..efda955c6c58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5417019a6e614f5285f9eb8f9e5b2d62395965b +refs/heads/master: b042245fc2ca8c0326f3f1ea6c4dafc561bb3a82 diff --git a/trunk/arch/arm/plat-versatile/Makefile b/trunk/arch/arm/plat-versatile/Makefile index 505a8f89601c..5cf88e8427b1 100644 --- a/trunk/arch/arm/plat-versatile/Makefile +++ b/trunk/arch/arm/plat-versatile/Makefile @@ -1,7 +1,8 @@ obj-y := clock.o obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o -# For all but the Integrator, compile these -ifeq ($(CONFIG_ARCH_INTEGRATOR),) -obj-y += sched-clock.o -obj-$(CONFIG_LEDS_CLASS) += leds.o +obj-$(CONFIG_ARCH_REALVIEW) += sched-clock.o +obj-$(CONFIG_ARCH_VERSATILE) += sched-clock.o +ifeq ($(CONFIG_LEDS_CLASS),y) +obj-$(CONFIG_ARCH_REALVIEW) += leds.o +obj-$(CONFIG_ARCH_VERSATILE) += leds.o endif