1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile
index 16dde0819934..69714db47c33 100644
--- a/arch/arm/plat-versatile/Makefile
+++ b/arch/arm/plat-versatile/Makefile
@@ -1,8 +1,7 @@
 obj-y   := clock.o
-ifneq ($(CONFIG_ARCH_INTEGRATOR),y)
+obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
-obj-y   += sched-clock.o
+obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o
-endif
+obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o
-ifeq ($(CONFIG_LEDS_CLASS),y)
+obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o
-obj-$(CONFIG_ARCH_REALVIEW) += leds.o
+obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o
-obj-$(CONFIG_ARCH_VERSATILE) += leds.o
+obj-$(CONFIG_SMP) += headsmp.o platsmp.o
-endif

diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile index 16dde0819934..69714db47c33 100644 --- a/arch/arm/plat-versatile/Makefile +++ b/arch/arm/plat-versatile/Makefile
@@ -1,8 +1,7 @@
1	obj-y := clock.o	1	obj-y := clock.o
2	ifneq ($(CONFIG_ARCH_INTEGRATOR),y)	2	obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
3	obj-y += sched-clock.o	3	obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o
4	endif	4	obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o
5	ifeq ($(CONFIG_LEDS_CLASS),y)	5	obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o
6	obj-$(CONFIG_ARCH_REALVIEW) += leds.o	6	obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o
7	obj-$(CONFIG_ARCH_VERSATILE) += leds.o	7	obj-$(CONFIG_SMP) += headsmp.o platsmp.o
8	endif