virtio: remove CONFIG_VIRTIO_RING

Everyone who selects VIRTIO is also made to select VIRTIO_RING; just make
them synonymous, since we removed the indirection layer some time ago.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

2 files changed, 1 insertions, 8 deletions

diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig
index eabc2a0cd989..8d5bddb56cb1 100644
--- a/drivers/virtio/Kconfig
+++ b/drivers/virtio/Kconfig
@@ -5,17 +5,12 @@ config VIRTIO
           bus, such as CONFIG_VIRTIO_PCI, CONFIG_VIRTIO_MMIO, CONFIG_LGUEST,
           CONFIG_RPMSG or CONFIG_S390_GUEST.
 
-config VIRTIO_RING
-        tristate
-        depends on VIRTIO
-
 menu "Virtio drivers"
 
 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
@@ -40,7 +35,6 @@ config VIRTIO_BALLOON
         tristate "Platform bus driver for memory mapped virtio devices (EXPERIMENTAL)"
         depends on HAS_IOMEM && EXPERIMENTAL
         select VIRTIO
-        select VIRTIO_RING
         ---help---
          This drivers provides support for memory mapped virtio
          platform device driver.
diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile
index 5a4c63cfd380..9076635697bb 100644
--- a/drivers/virtio/Makefile
+++ b/drivers/virtio/Makefile
@@ -1,5 +1,4 @@
-obj-$(CONFIG_VIRTIO) += virtio.o
-obj-$(CONFIG_VIRTIO_RING) += virtio_ring.o
+obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o
 obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o
 obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o
 obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o