diff options
| author | Jesse Barnes <jbarnes@nietzche.virtuousgeek.org> | 2006-09-10 11:13:18 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@nietzche.virtuousgeek.org> | 2006-09-10 11:13:18 -0700 |
| commit | b3a3020fd018df8bc5a8193d36e1a1c7ae8af8ba (patch) | |
| tree | beb4ca3b2d119286567fb0eaca9de00fa1a8e28d | |
| parent | 65256109bb8f5a26704ed960e1dd113981df5787 (diff) | |
the new PCI mapping routines are broken on sparc64 (in fact they look
broken for any 32 bit X server running on a 64 bit kernel) so #ifdef
them out for now. the PCI rework tree will make all this crap go away,
so I think we can tolerate the extra #ifdef for the next release.
| -rw-r--r-- | hw/xfree86/os-support/bus/linuxPci.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index a3c07f330..a97e6f0c9 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -83,7 +83,13 @@ static pciBusFuncs_t linuxFuncs0 = { /* pciAddrBusToHost */ linuxPpcBusAddrToHostAddr, #else /* pciAddrHostToBus */ pciAddrNOOP, +/* linuxTransAddrBusToHost is busted on sparc64 but the PCI rework tree + * makes it all moot, so we kludge it for now */ +#if defined(__sparc64__) +/* pciAddrBusToHost */ pciAddrNOOP, +#else /* pciAddrBusToHost */ linuxTransAddrBusToHost, +#endif /* __sparc64__ */ #endif /* pciControlBridge */ NULL, |