Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit eccbb05a64fef867362ff05b5d266757e3c82b36

Authored by Rusty Russell
1 parent 387daf1716
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 5 changed files with 1 additions and 11 deletions Side-by-side Diff

... ... @@ -587,7 +587,6 @@
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
arch/x86/lguest/Kconfig
Diff comments   View file @ eccbb05
... ... @@ -4,7 +4,6 @@
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
drivers/rpmsg/Kconfig
Diff comments   View file @ eccbb05
... ... @@ -4,7 +4,6 @@
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
drivers/virtio/Kconfig
Diff comments   View file @ eccbb05
... ... @@ -5,17 +5,12 @@
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
... ... @@ -40,7 +35,6 @@
40 35 tristate "Platform bus driver for memory mapped virtio devices (EXPERIMENTAL)"
41 36 depends on HAS_IOMEM && EXPERIMENTAL
42 37 select VIRTIO
43   - select VIRTIO_RING
44 38 ---help---
45 39 This drivers provides support for memory mapped virtio
46 40 platform device driver.
drivers/virtio/Makefile
Diff comments   View file @ eccbb05
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