Patched in Tegra support.

1 files changed, 10 insertions, 27 deletions

diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig
index 8d5bddb56cb..57e493b1bd2 100644
--- a/drivers/virtio/Kconfig
+++ b/drivers/virtio/Kconfig
@@ -1,9 +1,11 @@
+# Virtio always gets selected by whoever wants it.
 config VIRTIO
         tristate
-        ---help---
-          This option is selected by any driver which implements the virtio
-          bus, such as CONFIG_VIRTIO_PCI, CONFIG_VIRTIO_MMIO, CONFIG_LGUEST,
-          CONFIG_RPMSG or CONFIG_S390_GUEST.
+
+# Similarly the virtio ring implementation.
+config VIRTIO_RING
+        tristate
+        depends on VIRTIO
 
 menu "Virtio drivers"
 
@@ -11,6 +13,7 @@ config VIRTIO_PCI
         tristate "PCI driver for virtio devices (EXPERIMENTAL)"
         depends on PCI && EXPERIMENTAL
         select VIRTIO
+        select VIRTIO_RING
         ---help---
           This drivers provides support for virtio based paravirtual device
           drivers over PCI.  This requires that your VMM has appropriate PCI
@@ -23,33 +26,13 @@ config VIRTIO_PCI
           If unsure, say M.
 
 config VIRTIO_BALLOON
-        tristate "Virtio balloon driver"
-        depends on VIRTIO
+        tristate "Virtio balloon driver (EXPERIMENTAL)"
+        select VIRTIO
+        select VIRTIO_RING
         ---help---
          This driver supports increasing and decreasing the amount
          of memory within a KVM guest.
 
          If unsure, say M.
 
- config VIRTIO_MMIO
-        tristate "Platform bus driver for memory mapped virtio devices (EXPERIMENTAL)"
-        depends on HAS_IOMEM && EXPERIMENTAL
-        select VIRTIO
-        ---help---
-         This drivers provides support for memory mapped virtio
-         platform device driver.
-
-         If unsure, say N.
-
-config VIRTIO_MMIO_CMDLINE_DEVICES
-        bool "Memory mapped virtio devices parameter parsing"
-        depends on VIRTIO_MMIO
-        ---help---
-         Allow virtio-mmio devices instantiation via the kernel command line
-         or module parameters. Be aware that using incorrect parameters (base
-         address in particular) can crash your system - you have been warned.
-         See Documentation/kernel-parameters.txt for details.
-
-         If unsure, say 'N'.
-
 endmenu