summaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-21 22:33:22 +0200
committerChristoffer Dall <christoffer.dall@linaro.org>2013-06-26 19:50:06 +0200
commit8bd4ffd6b3a98f00267051dc095076ea2ff06ea8 (patch)
tree9f2b47786cc71950912d280d433a91512f1bc68a /arch/arm/kvm
parentUpdate MAINTAINERS: KVM/ARM work now funded by Linaro (diff)
downloadlinux-8bd4ffd6b3a98f00267051dc095076ea2ff06ea8.tar.xz
linux-8bd4ffd6b3a98f00267051dc095076ea2ff06ea8.zip
ARM: kvm: don't include drivers/virtio/Kconfig
The virtio configuration has recently moved and is now visible everywhere. Including the file again from KVM as we used to need earlier now causes dependency problems: warning: (CAIF_VIRTIO && VIRTIO_PCI && VIRTIO_MMIO && REMOTEPROC && RPMSG) selects VIRTIO which has unmet direct dependencies (VIRTUALIZATION) Cc: Christoffer Dall <cdall@cs.columbia.edu> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm/kvm')
-rw-r--r--arch/arm/kvm/Kconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
index 49dd64e579c2..ebf5015508b5 100644
--- a/arch/arm/kvm/Kconfig
+++ b/arch/arm/kvm/Kconfig
@@ -67,6 +67,4 @@ config KVM_ARM_TIMER
---help---
Adds support for the Architected Timers in virtual machines
-source drivers/virtio/Kconfig
-
endif # VIRTUALIZATION