diff options
| author | Ohad Ben-Cohen <ohad@wizery.com> | 2011-07-05 17:06:14 +0300 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-07-23 16:20:30 +0930 |
| commit | e72542191cbba4cf7fda21cb22e26b42d7415daf (patch) | |
| tree | 95fc296d2d0d8c9b52183bd664b4ea0b662bb866 /drivers | |
| parent | bbd9d6f7fbb0305c9a592bf05a32e87eb364a4ff (diff) | |
| download | linux-3.10-e72542191cbba4cf7fda21cb22e26b42d7415daf.tar.gz linux-3.10-e72542191cbba4cf7fda21cb22e26b42d7415daf.tar.bz2 linux-3.10-e72542191cbba4cf7fda21cb22e26b42d7415daf.zip | |
virtio: expose for non-virtualization users too
virtio has been so far used only in the context of virtualization,
and the virtio Kconfig was sourced directly by the relevant arch
Kconfigs when VIRTUALIZATION was selected.
Now that we start using virtio for inter-processor communications,
we need to source the virtio Kconfig outside of the virtualization
scope too.
Moreover, some architectures might use virtio for both virtualization
and inter-processor communications, so directly sourcing virtio
might yield unexpected results due to conflicting selections.
The simple solution offered by this patch is to always source virtio's
Kconfig in drivers/Kconfig, and remove it from the appropriate arch
Kconfigs. Additionally, a virtio menu entry has been added so virtio
drivers don't show up in the general drivers menu.
This way anyone can use virtio, though it's arguably less accessible
(and neat!) for virtualization users now.
Note: some architectures (mips and sh) seem to have a VIRTUALIZATION
menu merely for sourcing virtio's Kconfig, so that menu is removed too.
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/virtio/Kconfig | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 52e306dd501..9e7a4f5b5c2 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -112,6 +112,8 @@ source "drivers/uio/Kconfig" source "drivers/vlynq/Kconfig" +source "drivers/virtio/Kconfig" + source "drivers/xen/Kconfig" source "drivers/staging/Kconfig" diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index 3dd6294d10b..57e493b1bd2 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig @@ -7,6 +7,8 @@ config VIRTIO_RING tristate depends on VIRTIO +menu "Virtio drivers" + config VIRTIO_PCI tristate "PCI driver for virtio devices (EXPERIMENTAL)" depends on PCI && EXPERIMENTAL @@ -33,3 +35,4 @@ config VIRTIO_BALLOON If unsure, say M. +endmenu |