diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2010-08-18 22:37:37 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2010-08-18 22:37:37 +0000 |
| commit | 2b74c5abe4a86f4eb4938ad35766f1848b305ce1 (patch) | |
| tree | 512e5a2a9f286eac753a9d9781d56476dcb54699 /xserver | |
| parent | 0221de68ac4357b4dec9497e02510a4708c1c024 (diff) | |
Fix autoconfiguration on sparc and sparc64.
The code to add sunffb unconditionally on !solaris for __sparc__
systems is incorrect for openbsd. More specifically, due to interactions
between hardware drivers and wsfb in preinit we can't unconditionally
add wsfb to the list of fallbacks, so we only add wsfb if no other
option was found. Additionally sunffb does not need to be
unconditionally added because the bus probing code will find these
devices already.
So, long story short: make that code chunk conditional on __sparc__ &&
defined(__linux__) instead.
change from !openbsd to __linux__ requested by kettenis@.
Tested by at least myself and stsp@.
ok matthieu@, kettenis@.
Diffstat (limited to 'xserver')
| -rw-r--r-- | xserver/hw/xfree86/common/xf86AutoConfig.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xserver/hw/xfree86/common/xf86AutoConfig.c b/xserver/hw/xfree86/common/xf86AutoConfig.c index ea50042c2..2e10eb5eb 100644 --- a/xserver/hw/xfree86/common/xf86AutoConfig.c +++ b/xserver/hw/xfree86/common/xf86AutoConfig.c @@ -507,7 +507,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches) if (i < (nmatches - 1)) { #if defined(__i386__) || defined(__amd64__) || defined(__hurd__) matches[i++] = xnfstrdup("vesa"); -#elif defined(__sparc__) && !defined(sun) +#elif defined(__sparc__) && defined(__linux__) matches[i++] = xnfstrdup("sunffb"); #endif } |