evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

virtio: remove CONFIG_VIRTIO_RING

Browse source 
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>
This commit is contained in:
Rusty Russell 2012-09-28 15:05:15 +09:30
parent 387daf1716
commit eccbb05a64
5 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/s390/Kconfig
View file

@ -587,7 +587,6 @@ config S390_GUEST
depends on 64BIT && EXPERIMENTAL depends on 64BIT && EXPERIMENTAL
select VIRTUALIZATION select VIRTUALIZATION
select VIRTIO select VIRTIO
select VIRTIO_RING
select VIRTIO_CONSOLE select VIRTIO_CONSOLE
help help
Select this option if you want to run the kernel as a guest under Select this option if you want to run the kernel as a guest under

1
arch/x86/lguest/Kconfig
View file

@ -4,7 +4,6 @@ config LGUEST_GUEST
depends on X86_32 depends on X86_32
select VIRTUALIZATION select VIRTUALIZATION
select VIRTIO select VIRTIO
select VIRTIO_RING
select VIRTIO_CONSOLE select VIRTIO_CONSOLE
help help
Lguest is a tiny in-kernel hypervisor. Selecting this will Lguest is a tiny in-kernel hypervisor. Selecting this will

1
drivers/rpmsg/Kconfig
View file

@ -4,7 +4,6 @@ menu "Rpmsg drivers (EXPERIMENTAL)"
config RPMSG config RPMSG
tristate tristate
select VIRTIO select VIRTIO
select VIRTIO_RING
depends on EXPERIMENTAL depends on EXPERIMENTAL
endmenu endmenu

6
drivers/virtio/Kconfig
View file

@ -5,17 +5,12 @@ config VIRTIO
bus, such as CONFIG_VIRTIO_PCI, CONFIG_VIRTIO_MMIO, CONFIG_LGUEST, bus, such as CONFIG_VIRTIO_PCI, CONFIG_VIRTIO_MMIO, CONFIG_LGUEST,
CONFIG_RPMSG or CONFIG_S390_GUEST. CONFIG_RPMSG or CONFIG_S390_GUEST.
config VIRTIO_RING
tristate
depends on VIRTIO
menu "Virtio drivers" menu "Virtio drivers"
config VIRTIO_PCI config VIRTIO_PCI
tristate "PCI driver for virtio devices (EXPERIMENTAL)" tristate "PCI driver for virtio devices (EXPERIMENTAL)"
depends on PCI && EXPERIMENTAL depends on PCI && EXPERIMENTAL
select VIRTIO select VIRTIO
select VIRTIO_RING
---help--- ---help---
This drivers provides support for virtio based paravirtual device This drivers provides support for virtio based paravirtual device
drivers over PCI. This requires that your VMM has appropriate PCI 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)" tristate "Platform bus driver for memory mapped virtio devices (EXPERIMENTAL)"
depends on HAS_IOMEM && EXPERIMENTAL depends on HAS_IOMEM && EXPERIMENTAL
select VIRTIO select VIRTIO
select VIRTIO_RING
---help--- ---help---
This drivers provides support for memory mapped virtio This drivers provides support for memory mapped virtio
platform device driver. platform device driver.

3
drivers/virtio/Makefile
View file

@ -1,5 +1,4 @@
obj-$(CONFIG_VIRTIO) += virtio.o obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o
obj-$(CONFIG_VIRTIO_RING) += virtio_ring.o
obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o
obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o
obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o