From: Arnd Bergmann Date: Tue, 19 Feb 2013 16:03:09 +0000 (+0100) Subject: Merge branch 'next/virt' into for-next X-Git-Tag: next-20130220~18^2~12 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b5b3795b9d2551f2f27be09a9e4f6a66644c2d69;p=karo-tx-linux.git Merge branch 'next/virt' into for-next * next/virt: (55 commits) ARM: arch_timer: include linux/errno.h arm: arch_timer: add missing inline in stub function ARM: KVM: arch_timers: Wire the init code and config option ARM: KVM: arch_timers: Add timer world switch ARM: KVM: arch_timers: Add guest timer core support ARM: KVM: Add VGIC configuration option ARM: KVM: VGIC initialisation code ARM: KVM: VGIC control interface world switch ARM: KVM: VGIC interrupt injection ARM: KVM: vgic: retire queued, disabled interrupts ARM: KVM: VGIC virtual CPU interface management ARM: KVM: VGIC distributor handling ARM: KVM: VGIC accept vcpu and dist base addresses from user space ARM: KVM: Initial VGIC infrastructure code ARM: KVM: Keep track of currently running vcpus KVM: ARM: Introduce KVM_ARM_SET_DEVICE_ADDR ioctl ARM: gic: add __ASSEMBLY__ guard to C definitions ARM: gic: define GICH offsets for VGIC support ARM: gic: add missing distributor defintions ARM: mach-virt: fixup machine descriptor after removal of sys_timer ... --- b5b3795b9d2551f2f27be09a9e4f6a66644c2d69 diff --cc drivers/clocksource/Makefile index 596c45c2f192,49271105339f..7d671b85a98e --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@@ -17,7 -17,6 +17,7 @@@ 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_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