[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/xfree86/common Don't auto...

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

details:   https://anonhg.NetBSD.org/xsrc/rev/83ad3eac0d34
branches:  trunk
changeset: 10423:83ad3eac0d34
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Feb 09 12:53:19 2020 +0000

description:
Don't autoload vesa on x86 at all as it conflicts with wsfb.

diffstat:

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

diffs (12 lines):

diff -r b7140f073ccd -r 83ad3eac0d34 external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
--- a/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c  Sun Feb 09 11:40:14 2020 +0000
+++ b/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c  Sun Feb 09 12:53:19 2020 +0000
@@ -361,7 +361,7 @@
 #endif
 
     /* Fallback to platform default hardware */
-#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
+#if (defined(__i386__) || defined(__amd64__) || defined(__hurd__)) && !defined(__NetBSD__)
     xf86AddMatchedDriver(md, "vesa");
 #elif defined(__sparc__) && !defined(__sun)
     xf86AddMatchedDriver(md, "sunffb");