diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 18:09:03 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 18:09:03 +0000 |
| commit | 58daf18cdcab550262a5f4681e1f1e073e21965a (patch) | |
| tree | 2096324b947761a567dd451f33664f17ee1de2cd /arch/arm/plat-versatile/Makefile | |
| parent | aa312be1987d43216e72ffce42bccf6bf81f62ed (diff) | |
| parent | 0af85dda39d9b673aca8c0ebae004ea70f3efc93 (diff) | |
| download | blackbird-op-linux-58daf18cdcab550262a5f4681e1f1e073e21965a.tar.gz blackbird-op-linux-58daf18cdcab550262a5f4681e1f1e073e21965a.zip | |
Merge branch 'clksrc' into devel
Conflicts:
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-versatile/Makefile
Diffstat (limited to 'arch/arm/plat-versatile/Makefile')
| -rw-r--r-- | arch/arm/plat-versatile/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile index aaa571d17924..16dde0819934 100644 --- a/arch/arm/plat-versatile/Makefile +++ b/arch/arm/plat-versatile/Makefile @@ -1,6 +1,7 @@ obj-y := clock.o -obj-$(CONFIG_ARCH_REALVIEW) += sched-clock.o -obj-$(CONFIG_ARCH_VERSATILE) += sched-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 |
