Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-beck.git] / drivers / clocksource / Makefile

diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 596c45c2f192114224f6626f786401f5b41656a6..7d671b85a98e6ff59c562dcbaa2941dc4794731e 100644 (file)
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -20,4 +20,4 @@ obj-$(CONFIG_SUNXI_TIMER)     += sunxi_timer.o
 obj-$(CONFIG_ARCH_TEGRA)       += tegra20_timer.o
 obj-$(CONFIG_VT8500_TIMER)     += vt8500_timer.o
 
-obj-$(CONFIG_CLKSRC_ARM_GENERIC)       += arm_generic.o
+obj-$(CONFIG_ARM_ARCH_TIMER)           += arm_arch_timer.o