1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile
index 5cf88e8427b1..16dde0819934 100644
--- a/arch/arm/plat-versatile/Makefile
+++ b/arch/arm/plat-versatile/Makefile
@@ -1,7 +1,7 @@
 obj-y   := clock.o
-obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
+ifneq ($(CONFIG_ARCH_INTEGRATOR),y)
-obj-$(CONFIG_ARCH_REALVIEW) += sched-clock.o
+obj-y   += sched-clock.o
-obj-$(CONFIG_ARCH_VERSATILE) += sched-clock.o
+endif
 ifeq ($(CONFIG_LEDS_CLASS),y)
 obj-$(CONFIG_ARCH_REALVIEW) += leds.o
 obj-$(CONFIG_ARCH_VERSATILE) += leds.o

diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile index 5cf88e8427b1..16dde0819934 100644 --- a/arch/arm/plat-versatile/Makefile +++ b/arch/arm/plat-versatile/Makefile
@@ -1,7 +1,7 @@
1	obj-y := clock.o	1	obj-y := clock.o
2	obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o	2	ifneq ($(CONFIG_ARCH_INTEGRATOR),y)
3	obj-$(CONFIG_ARCH_REALVIEW) += sched-clock.o	3	obj-y += sched-clock.o
4	obj-$(CONFIG_ARCH_VERSATILE) += sched-clock.o	4	endif
5	ifeq ($(CONFIG_LEDS_CLASS),y)	5	ifeq ($(CONFIG_LEDS_CLASS),y)
6	obj-$(CONFIG_ARCH_REALVIEW) += leds.o	6	obj-$(CONFIG_ARCH_REALVIEW) += leds.o
7	obj-$(CONFIG_ARCH_VERSATILE) += leds.o	7	obj-$(CONFIG_ARCH_VERSATILE) += leds.o