Merge branch 'depends/cleanup' into next/virt
Olof Johansson [Mon, 11 Feb 2013 17:21:44 +0000 (09:21 -0800)]
1  2 
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/timer.c
drivers/clocksource/Kconfig
drivers/clocksource/Makefile

Simple merge
Simple merge
@@@ -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