tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Rusty Russell eccbb05a 387daf17

+1 -11
-1
arch/s390/Kconfig
··· 587 587 depends on 64BIT && EXPERIMENTAL 588 588 select VIRTUALIZATION 589 589 select VIRTIO 590 - select VIRTIO_RING 591 590 select VIRTIO_CONSOLE 592 591 help 593 592 Select this option if you want to run the kernel as a guest under
-1
arch/x86/lguest/Kconfig
··· 4 4 depends on X86_32 5 5 select VIRTUALIZATION 6 6 select VIRTIO 7 - select VIRTIO_RING 8 7 select VIRTIO_CONSOLE 9 8 help 10 9 Lguest is a tiny in-kernel hypervisor. Selecting this will
-1
drivers/rpmsg/Kconfig
··· 4 4 config RPMSG 5 5 tristate 6 6 select VIRTIO 7 - select VIRTIO_RING 8 7 depends on EXPERIMENTAL 9 8 10 9 endmenu
-6
drivers/virtio/Kconfig
··· 5 5 bus, such as CONFIG_VIRTIO_PCI, CONFIG_VIRTIO_MMIO, CONFIG_LGUEST, 6 6 CONFIG_RPMSG or CONFIG_S390_GUEST. 7 7 8 - config VIRTIO_RING 9 - tristate 10 - depends on VIRTIO 11 - 12 8 menu "Virtio drivers" 13 9 14 10 config VIRTIO_PCI 15 11 tristate "PCI driver for virtio devices (EXPERIMENTAL)" 16 12 depends on PCI && EXPERIMENTAL 17 13 select VIRTIO 18 - select VIRTIO_RING 19 14 ---help--- 20 15 This drivers provides support for virtio based paravirtual device 21 16 drivers over PCI. This requires that your VMM has appropriate PCI ··· 35 40 tristate "Platform bus driver for memory mapped virtio devices (EXPERIMENTAL)" 36 41 depends on HAS_IOMEM && EXPERIMENTAL 37 42 select VIRTIO 38 - select VIRTIO_RING 39 43 ---help--- 40 44 This drivers provides support for memory mapped virtio 41 45 platform device driver.
+1 -2
drivers/virtio/Makefile
··· 1 - obj-$(CONFIG_VIRTIO) += virtio.o 2 - obj-$(CONFIG_VIRTIO_RING) += virtio_ring.o 1 + obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o 3 2 obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o 4 3 obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o 5 4 obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o