diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-23 13:21:59 -0500 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-11 19:06:00 +0000 |
| commit | 967f84275ba74eac696f798ce1a780285170b5e7 (patch) | |
| tree | e8dfd11d9587c0faf1511765e84127ed50b6d6dc /arch/arm/kvm/Makefile | |
| parent | c7e3ba64ba16eddfbfc66ec099860f40e808e124 (diff) | |
| download | blackbird-op-linux-967f84275ba74eac696f798ce1a780285170b5e7.tar.gz blackbird-op-linux-967f84275ba74eac696f798ce1a780285170b5e7.zip | |
ARM: KVM: arch_timers: Wire the init code and config option
It is now possible to select CONFIG_KVM_ARM_TIMER to enable the
KVM architected timer support.
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Christoffer Dall <c.dall@virtualopensystems.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/kvm/Makefile')
| -rw-r--r-- | arch/arm/kvm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile index dece8edc2e4a..fc96ce6f2357 100644 --- a/arch/arm/kvm/Makefile +++ b/arch/arm/kvm/Makefile @@ -20,3 +20,4 @@ obj-y += kvm-arm.o init.o interrupts.o obj-y += arm.o guest.o mmu.o emulate.o reset.o obj-y += coproc.o coproc_a15.o mmio.o psci.o obj-$(CONFIG_KVM_ARM_VGIC) += vgic.o +obj-$(CONFIG_KVM_ARM_TIMER) += arch_timer.o |
