Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[pandora-kernel.git] / arch / x86 / kernel / cpu / hypervisor.c

diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 8095f86..755f64f 100644 (file)
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -32,11 +32,11 @@
  */
 static const __initconst struct hypervisor_x86 * const hypervisors[] =
 {
-       &x86_hyper_vmware,
-       &x86_hyper_ms_hyperv,
 #ifdef CONFIG_XEN_PVHVM
        &x86_hyper_xen_hvm,
 #endif
+       &x86_hyper_vmware,
+       &x86_hyper_ms_hyperv,
 };
 
 const struct hypervisor_x86 *x86_hyper;