aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2007-11-07 21:46:31 -0500
committerRusty Russell <rusty@rustcorp.com.au>2008-02-04 07:50:05 -0500
commit0ad07ec1fd2f3e90dfb086b04c07a83db40e9172 (patch)
tree783d29d4e7d7e94ed9020b26e37b9c33f7aefcb2 /drivers
parent81a8deab1ce3816c6a89e3429e234e7d3686da94 (diff)
virtio: Put the virtio under the virtualization menu
This patch moves virtio under the virtualization menu and changes virtio devices to not claim to only be for lguest. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/Kconfig2
-rw-r--r--drivers/block/Kconfig3
-rw-r--r--drivers/net/Kconfig3
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 08d4ae201597..3f8a231fe754 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -91,6 +91,4 @@ source "drivers/dca/Kconfig"
91source "drivers/auxdisplay/Kconfig" 91source "drivers/auxdisplay/Kconfig"
92 92
93source "drivers/uio/Kconfig" 93source "drivers/uio/Kconfig"
94
95source "drivers/virtio/Kconfig"
96endmenu 94endmenu
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index f2122855d4ec..64e5148d82bc 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -440,6 +440,7 @@ config VIRTIO_BLK
440 tristate "Virtio block driver (EXPERIMENTAL)" 440 tristate "Virtio block driver (EXPERIMENTAL)"
441 depends on EXPERIMENTAL && VIRTIO 441 depends on EXPERIMENTAL && VIRTIO
442 ---help--- 442 ---help---
443 This is the virtual block driver for lguest. Say Y or M. 443 This is the virtual block driver for virtio. It can be used with
444 lguest or QEMU based VMMs (like KVM or Xen). Say Y or M.
444 445
445endif # BLK_DEV 446endif # BLK_DEV
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 389980f0e59e..e9d761cbde93 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -3113,6 +3113,7 @@ config VIRTIO_NET
3113 tristate "Virtio network driver (EXPERIMENTAL)" 3113 tristate "Virtio network driver (EXPERIMENTAL)"
3114 depends on EXPERIMENTAL && VIRTIO 3114 depends on EXPERIMENTAL && VIRTIO
3115 ---help--- 3115 ---help---
3116 This is the virtual network driver for lguest. Say Y or M. 3116 This is the virtual network driver for virtio. It can be used with
3117 lguest or QEMU based VMMs (like KVM or Xen). Say Y or M.
3117 3118
3118endif # NETDEVICES 3119endif # NETDEVICES