Index: hw/xfree86/common/xf86AutoConfig.c
===================================================================
--- hw/xfree86/common/xf86AutoConfig.c.orig
+++ hw/xfree86/common/xf86AutoConfig.c
@@ -267,26 +267,26 @@ listPossibleVideoDrivers(char *matches[]
     if (i < (nmatches - 1))
         i = xf86PciMatchDriver(matches, nmatches);
 #endif
+
+#if defined(__linux__)
+    matches[i++] = xnfstrdup("modesetting");
+#endif
     /* Fallback to platform default hardware */
     if (i < (nmatches - 1)) {
 #if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
-        matches[i++] = xnfstrdup("vesa");
+        matches[i++] = xnfstrdup("fbdev");
 #elif defined(__sparc__) && !defined(sun)
         matches[i++] = xnfstrdup("sunffb");
 #endif
     }
 
-#if defined(__linux__)
-    matches[i++] = xnfstrdup("modesetting");
-#endif
-
 #if !defined(sun)
     /* Fallback to platform default frame buffer driver */
     if (i < (nmatches - 1)) {
 #if !defined(__linux__) && defined(__sparc__)
         matches[i++] = xnfstrdup("wsfb");
 #else
-        matches[i++] = xnfstrdup("fbdev");
+        matches[i++] = xnfstrdup("vesa");
 #endif
     }
 #endif                          /* !sun */