diff --git a/[refs] b/[refs] index ab7982290f2e..a2fd8adc1508 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f154f47d5180c2012bf97999e6c600d45db8af2d +refs/heads/master: e084e531000a488d2d27864266c13ac824575a8b diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 4bd0c8febae9..0bf0653969dd 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -416,7 +416,6 @@ config KVM_CLOCK bool "KVM paravirtualized clock" select PARAVIRT select PARAVIRT_CLOCK - depends on !X86_VOYAGER help Turning on this option will allow you to run a paravirtualized clock when running over the KVM hypervisor. Instead of relying on a PIT