diff --git a/[refs] b/[refs] index 1142b741d763..c75d3bfb6228 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18420001d6ceafbe094a6f911126c6eee34d25c4 +refs/heads/master: 9f53a729dbf0ba8abdc464f6eb828f485d3417f7 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index 6964e247f473..1a94a73fe801 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -220,7 +220,7 @@ config PARAVIRT config VMI bool "VMI Paravirt-ops support" - depends on PARAVIRT && !COMPAT_VDSO + depends on PARAVIRT help VMI provides a paravirtualized interface to the VMware ESX server (it could be used by other hypervisors in theory too, but is not