diff mbox

ARM: kvm: don't include drivers/virtio/Kconfig

Message ID 201306212233.23062.arnd@arndb.de (mailing list archive)
State New, archived
Headers show

Commit Message

Arnd Bergmann June 21, 2013, 8:33 p.m. UTC
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>

Comments

Christoffer Dall June 21, 2013, 8:50 p.m. UTC | #1
On Fri, Jun 21, 2013 at 10:33:22PM +0200, Arnd Bergmann wrote:
> 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>
> 
> diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
> index 370e1a8..017db7c 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

Thanks, queued for 3.11.

-Christoffer
diff mbox

Patch

diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
index 370e1a8..017db7c 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