From 532a229dc32d5cb17250fe2d73cc5a9d85eaa597 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Mon, 15 Mar 2010 20:50:53 +0000 Subject: Only add wsfb to the list of autoconfigured drivers if no other matches were found. Makes xorg.conf-less X work again on sparc64 and macppc systems with a single display adapter. ok matthieu@, beck@ --- xserver/hw/xfree86/common/xf86AutoConfig.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xserver/hw/xfree86/common/xf86AutoConfig.c b/xserver/hw/xfree86/common/xf86AutoConfig.c index 21ebd3b00..36411cb92 100644 --- a/xserver/hw/xfree86/common/xf86AutoConfig.c +++ b/xserver/hw/xfree86/common/xf86AutoConfig.c @@ -524,7 +524,9 @@ listPossibleVideoDrivers(char *matches[], int nmatches) if (i < (nmatches - 1)) { #if defined(__OpenBSD__) # if !defined(__i386__) && !defined(__amd64__) - matches[i++] = xnfstrdup("wsfb"); + if (i == 0) { + matches[i++] = xnfstrdup("wsfb"); + } # endif #elif !defined(__linux__) && defined(__sparc__) matches[i++] = xnfstrdup("wsfb"); -- cgit v1.2.3