]> Pileus Git - ~andy/linux/commitdiff
ARM: kvm: don't include drivers/virtio/Kconfig
authorArnd Bergmann <arnd@arndb.de>
Fri, 21 Jun 2013 20:33:22 +0000 (22:33 +0200)
committerChristoffer Dall <christoffer.dall@linaro.org>
Wed, 26 Jun 2013 17:50:06 +0000 (10:50 -0700)
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>
arch/arm/kvm/Kconfig

index 49dd64e579c2da533b1cd43235aef3a9d286b909..ebf5015508b525c052ddfed5c4ea2ea0a0ed969e 100644 (file)
@@ -67,6 +67,4 @@ config KVM_ARM_TIMER
        ---help---
          Adds support for the Architected Timers in virtual machines
 
-source drivers/virtio/Kconfig
-
 endif # VIRTUALIZATION