diff --git a/[refs] b/[refs] index 09bc7a320661..76d662acb78c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3d1c4bdf16bd154d9f27f34fca28edca90465eb +refs/heads/master: 9525ca0286afd54a5cd69d9ded741b4df8d0c554 diff --git a/trunk/drivers/Kconfig b/trunk/drivers/Kconfig index 34f40ea0ba60..d945ffc57c25 100644 --- a/trunk/drivers/Kconfig +++ b/trunk/drivers/Kconfig @@ -93,6 +93,4 @@ source "drivers/auxdisplay/Kconfig" source "drivers/kvm/Kconfig" source "drivers/uio/Kconfig" - -source "drivers/lguest/Kconfig" endmenu diff --git a/trunk/drivers/kvm/Kconfig b/trunk/drivers/kvm/Kconfig index 8749fa4ffcee..656920636cb2 100644 --- a/trunk/drivers/kvm/Kconfig +++ b/trunk/drivers/kvm/Kconfig @@ -47,4 +47,8 @@ config KVM_AMD Provides support for KVM on AMD processors equipped with the AMD-V (SVM) extensions. +# OK, it's a little counter-intuitive to do this, but it puts it neatly under +# the virtualization menu. +source drivers/lguest/Kconfig + endif # VIRTUALIZATION