Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux into...

[~andy/linux] / drivers / clocksource / Makefile

diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index b65d0c56ab3523d1f777d37aa17338073220a2b3..d496a55f6bb0c3061746559813e6d7dbc015aee7 100644 (file)
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_DW_APB_TIMER)    += dw_apb_timer.o
 obj-$(CONFIG_DW_APB_TIMER_OF)  += dw_apb_timer_of.o
 obj-$(CONFIG_CLKSRC_DBX500_PRCMU)      += clksrc-dbx500-prcmu.o
 obj-$(CONFIG_ARMADA_370_XP_TIMER)      += time-armada-370-xp.o
+obj-$(CONFIG_ARCH_BCM2835)     += bcm2835_timer.o