Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eccbb05a authored by Rusty Russell's avatar Rusty Russell
Browse files

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: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 387daf17
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -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
+0 −1
Original line number Diff line number Diff line
@@ -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
+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ menu "Rpmsg drivers (EXPERIMENTAL)"
config RPMSG
	tristate
	select VIRTIO
	select VIRTIO_RING
	depends on EXPERIMENTAL

endmenu
+0 −6
Original line number Diff line number Diff line
@@ -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.
+1 −2
Original line number Diff line number Diff line
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