diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-09 08:44:23 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-09 08:44:23 +0100 |
commit | e94f16a4fde646b3f155788fe37339b61264b0a9 (patch) | |
tree | 28f1cf8b1980b6b25c1c58e3e157610a1b851996 /arch/x86/lguest/Kconfig | |
parent | d2b5851d8583e690eeb5ac8dfff5da92e1f1468f (diff) | |
parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
download | linux-e94f16a4fde646b3f155788fe37339b61264b0a9.tar.gz linux-e94f16a4fde646b3f155788fe37339b61264b0a9.tar.bz2 linux-e94f16a4fde646b3f155788fe37339b61264b0a9.zip |
Merge 4.0-rc3 into char-misc-next
We want the mei fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/lguest/Kconfig')
-rw-r--r-- | arch/x86/lguest/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig index 4a0890f815c4..08f41caada45 100644 --- a/arch/x86/lguest/Kconfig +++ b/arch/x86/lguest/Kconfig @@ -1,6 +1,6 @@ config LGUEST_GUEST bool "Lguest guest support" - depends on X86_32 && PARAVIRT + depends on X86_32 && PARAVIRT && PCI select TTY select VIRTUALIZATION select VIRTIO @@ -8,7 +8,7 @@ config LGUEST_GUEST help Lguest is a tiny in-kernel hypervisor. Selecting this will allow your kernel to boot under lguest. This option will increase - your kernel size by about 6k. If in doubt, say N. + your kernel size by about 10k. If in doubt, say N. If you say Y here, make sure you say Y (or M) to the virtio block and net drivers which lguest needs. |