diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-03-15 20:50:53 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-03-15 20:50:53 +0000 |
| commit | 532a229dc32d5cb17250fe2d73cc5a9d85eaa597 (patch) | |
| tree | f2ca5b7644d360356a9caf2bb9e6a45a3fcc3f00 | |
| parent | d516b98f61e8f40cc8d63f832d7bb92d23ace61d (diff) | |
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@
| -rw-r--r-- | xserver/hw/xfree86/common/xf86AutoConfig.c | 4 |
1 files changed, 3 insertions, 1 deletions
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"); |