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>

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 107610e01a295e27a7fdb1d82fbf8ad0270a4bfc..9faf3d9b26c739e32b58097734fb08c7320ea10c 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -587,7 +587,6 @@ config S390_GUEST
        depends on 64BIT && EXPERIMENTAL
        select VIRTUALIZATION
        select VIRTIO
-       select VIRTIO_RING
        select VIRTIO_CONSOLE
        help
          Select this option if you want to run the kernel as a guest under

diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig
index 6e121a2a49e1b672fc8c191ae8c7ee40733076d0..7872a3330fb51ed1576e3c40d78820cb73915b50 100644 (file)
--- a/arch/x86/lguest/Kconfig
+++ b/arch/x86/lguest/Kconfig
@@ -4,7 +4,6 @@ config LGUEST_GUEST
        depends on X86_32
        select VIRTUALIZATION
        select VIRTIO
-       select VIRTIO_RING
        select VIRTIO_CONSOLE
        help
          Lguest is a tiny in-kernel hypervisor.  Selecting this will

diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig
index 32aead65735adf4389d2708d73babc0635a5e879..2bd911f125710ca74bdaaa0d8fa1933c7e43953f 100644 (file)
--- a/drivers/rpmsg/Kconfig
+++ b/drivers/rpmsg/Kconfig
@@ -4,7 +4,6 @@ menu "Rpmsg drivers (EXPERIMENTAL)"
 config RPMSG
        tristate
        select VIRTIO
-       select VIRTIO_RING
        depends on EXPERIMENTAL
 
 endmenu

diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig
index eabc2a0cd9893bb441061b3ba0848c018a65d61e..8d5bddb56cb1a65c02ceac34bb84705bec53bd1b 100644 (file)
--- 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 5a4c63cfd3803308726ce5fb95fd73136ef5dae5..9076635697bb0fe4bd395f172eb67f9a0cf5ccfd 100644 (file)
--- 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