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 /arch | |
| 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 'arch')
| -rw-r--r-- | arch/s390/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/lguest/Kconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 107610e01a29..9faf3d9b26c7 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
| @@ -587,7 +587,6 @@ config S390_GUEST | |||
| 587 | depends on 64BIT && EXPERIMENTAL | 587 | depends on 64BIT && EXPERIMENTAL |
| 588 | select VIRTUALIZATION | 588 | select VIRTUALIZATION |
| 589 | select VIRTIO | 589 | select VIRTIO |
| 590 | select VIRTIO_RING | ||
| 591 | select VIRTIO_CONSOLE | 590 | select VIRTIO_CONSOLE |
| 592 | help | 591 | help |
| 593 | Select this option if you want to run the kernel as a guest under | 592 | Select this option if you want to run the kernel as a guest under |
diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig index 6e121a2a49e1..7872a3330fb5 100644 --- a/arch/x86/lguest/Kconfig +++ b/arch/x86/lguest/Kconfig | |||
| @@ -4,7 +4,6 @@ config LGUEST_GUEST | |||
| 4 | depends on X86_32 | 4 | depends on X86_32 |
| 5 | select VIRTUALIZATION | 5 | select VIRTUALIZATION |
| 6 | select VIRTIO | 6 | select VIRTIO |
| 7 | select VIRTIO_RING | ||
| 8 | select VIRTIO_CONSOLE | 7 | select VIRTIO_CONSOLE |
| 9 | help | 8 | help |
| 10 | Lguest is a tiny in-kernel hypervisor. Selecting this will | 9 | Lguest is a tiny in-kernel hypervisor. Selecting this will |