diff --git a/[refs] b/[refs] index 1f6e9809e710..ab7982290f2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36619a8a80793a803588a17f772313d5c948357d +refs/heads/master: f154f47d5180c2012bf97999e6c600d45db8af2d diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index f59d29201980..4bd0c8febae9 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -406,7 +406,6 @@ config VMI bool "VMI Guest support" select PARAVIRT depends on X86_32 - depends on !X86_VOYAGER help VMI provides a paravirtualized interface to the VMware ESX server (it could be used by other hypervisors in theory too, but is not