From: Arnd Bergmann Date: Tue, 9 Apr 2013 13:57:27 +0000 (+0200) Subject: Merge branch 'mxs/cleanup' into next/multiplatform X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=71f6424023cb9fa381efc7237ca05926b2b1ca9a;p=linux.git Merge branch 'mxs/cleanup' into next/multiplatform This is a dependency for mxs/multiplatform Signed-off-by: Arnd Bergmann Conflicts: drivers/clocksource/Makefile --- 71f6424023cb9fa381efc7237ca05926b2b1ca9a diff --cc drivers/clocksource/Makefile index 5e2176f9453fa,89c5adc498b35..00c08621c6c2f --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@@ -16,8 -16,7 +16,9 @@@ obj-$(CONFIG_CLKSRC_NOMADIK_MTU) += nom 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 +obj-$(CONFIG_ARCH_MARCO) += timer-marco.o + obj-$(CONFIG_ARCH_MXS) += mxs_timer.o +obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o obj-$(CONFIG_SUNXI_TIMER) += sunxi_timer.o obj-$(CONFIG_ARCH_TEGRA) += tegra20_timer.o obj-$(CONFIG_VT8500_TIMER) += vt8500_timer.o