[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/xfree86/common Revert pre...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/8f87f2b03707
branches:  trunk
changeset: 10424:8f87f2b03707
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Feb 09 13:02:24 2020 +0000

description:
Revert previous two commits, will fix this another way.

diffstat:

 external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (25 lines):

diff -r 83ad3eac0d34 -r 8f87f2b03707 external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
--- a/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c  Sun Feb 09 12:53:19 2020 +0000
+++ b/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c  Sun Feb 09 13:02:24 2020 +0000
@@ -356,16 +356,16 @@
     xf86AddMatchedDriver(md, "fbdev");
 #endif
 
-#if defined(__NetBSD__)
-    xf86AddMatchedDriver(md, "wsfb");
-#endif
-
     /* Fallback to platform default hardware */
-#if (defined(__i386__) || defined(__amd64__) || defined(__hurd__)) && !defined(__NetBSD__)
+#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
     xf86AddMatchedDriver(md, "vesa");
 #elif defined(__sparc__) && !defined(__sun)
     xf86AddMatchedDriver(md, "sunffb");
 #endif
+    
+#if defined(__NetBSD__)
+    xf86AddMatchedDriver(md, "wsfb");
+#endif
 }
 
 /* copy a screen section and enter the desired driver