diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2012-09-28 01:35:15 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-09-28 01:35:15 -0400 |
commit | eccbb05a64fef867362ff05b5d266757e3c82b36 (patch) | |
tree | e4cca0e3a865f8bd529e1085046483dcb9c5c8b8 /drivers/virtio/Kconfig | |
parent | 387daf1716da579fc1d198414d890967cd624a5b (diff) |
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>
Diffstat (limited to 'drivers/virtio/Kconfig')
-rw-r--r-- | drivers/virtio/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index eabc2a0cd989..8d5bddb56cb1 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig | |||
@@ -5,17 +5,12 @@ config VIRTIO | |||
5 | bus, such as CONFIG_VIRTIO_PCI, CONFIG_VIRTIO_MMIO, CONFIG_LGUEST, | 5 | bus, such as CONFIG_VIRTIO_PCI, CONFIG_VIRTIO_MMIO, CONFIG_LGUEST, |
6 | CONFIG_RPMSG or CONFIG_S390_GUEST. | 6 | CONFIG_RPMSG or CONFIG_S390_GUEST. |
7 | 7 | ||
8 | config VIRTIO_RING | ||
9 | tristate | ||
10 | depends on VIRTIO | ||
11 | |||
12 | menu "Virtio drivers" | 8 | menu "Virtio drivers" |
13 | 9 | ||
14 | config VIRTIO_PCI | 10 | config VIRTIO_PCI |
15 | tristate "PCI driver for virtio devices (EXPERIMENTAL)" | 11 | tristate "PCI driver for virtio devices (EXPERIMENTAL)" |
16 | depends on PCI && EXPERIMENTAL | 12 | depends on PCI && EXPERIMENTAL |
17 | select VIRTIO | 13 | select VIRTIO |
18 | select VIRTIO_RING | ||
19 | ---help--- | 14 | ---help--- |
20 | This drivers provides support for virtio based paravirtual device | 15 | This drivers provides support for virtio based paravirtual device |
21 | drivers over PCI. This requires that your VMM has appropriate PCI | 16 | drivers over PCI. This requires that your VMM has appropriate PCI |
@@ -40,7 +35,6 @@ config VIRTIO_BALLOON | |||
40 | tristate "Platform bus driver for memory mapped virtio devices (EXPERIMENTAL)" | 35 | tristate "Platform bus driver for memory mapped virtio devices (EXPERIMENTAL)" |
41 | depends on HAS_IOMEM && EXPERIMENTAL | 36 | depends on HAS_IOMEM && EXPERIMENTAL |
42 | select VIRTIO | 37 | select VIRTIO |
43 | select VIRTIO_RING | ||
44 | ---help--- | 38 | ---help--- |
45 | This drivers provides support for memory mapped virtio | 39 | This drivers provides support for memory mapped virtio |
46 | platform device driver. | 40 | platform device driver. |