diff --git a/[refs] b/[refs] index f25142eb5a39..a37a8af0a6ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54523edd237b9e792a3b76988fde23a91d739f43 +refs/heads/master: c3e6a2042fef33b747d2ae3961f5312af801973d diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 363111f40f34..82105349612d 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -434,7 +434,6 @@ source "arch/x86/lguest/Kconfig" config PARAVIRT bool "Enable paravirtualization code" - depends on !X86_VOYAGER help This changes the kernel so it can modify itself when it is run under a hypervisor, potentially improving performance significantly