Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[u-boot] / arch / arm / mach-at91 / armv7 / Makefile

diff --git a/arch/arm/mach-at91/armv7/Makefile b/arch/arm/mach-at91/armv7/Makefile
index 9538bc1fad2a536ec28eceff761a7bbcbe9c7e5c..1ede4cb10abe9ec5bd7113652646a82af535d39a 100644 (file)
--- a/arch/arm/mach-at91/armv7/Makefile
+++ b/arch/arm/mach-at91/armv7/Makefile
@@ -14,4 +14,6 @@ obj-$(CONFIG_SAMA5D4) += sama5d4_devices.o
 obj-y += clock.o
 obj-y += cpu.o
 obj-y += reset.o
+ifeq ($(CONFIG_ATMEL_PIT_TIMER),)
 obj-y += timer.o
+endif