From: Olof Johansson Date: Mon, 11 Feb 2013 17:21:44 +0000 (-0800) Subject: Merge branch 'depends/cleanup' into next/virt X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=5f48a29f1721736930b7817b430039c1d348dd05;p=linux-edison.git Merge branch 'depends/cleanup' into next/virt --- 5f48a29f1721736930b7817b430039c1d348dd05 diff --cc drivers/clocksource/Makefile index e69511c4c66,440449c1ca2..49271105339 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@@ -16,5 -17,6 +17,6 @@@ obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += cl obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o obj-$(CONFIG_SUNXI_TIMER) += sunxi_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