diff options
| author | Ian Romanick <idr@us.ibm.com> | 2006-10-24 08:57:59 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2006-10-24 08:57:59 -0700 |
| commit | 8b909135664abb69ada522e8e39495d9eca717ac (patch) | |
| tree | 318a3d943ac8a81bfbb4f2b210a782028b54e5d7 /hw/xfree86/os-support/bus/linuxPci.c | |
| parent | 21291d6ca7188e5733ed0c93215ee0f1f0f90cc9 (diff) | |
| parent | 948a97b97e93cee05a23f1f1ae699c5e181bc8ce (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86DoScanPci.c
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/scanpci/extrapci.ids
hw/xfree86/scanpci/pci.ids
hw/xfree86/scanpci/pciid2c.pl
hw/xfree86/scanpci/xf86PciStdIds.h
Diffstat (limited to 'hw/xfree86/os-support/bus/linuxPci.c')
| -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 a9db5c887..0a1d16727 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -71,7 +71,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(__sparc__) +/* pciAddrBusToHost */ pciAddrNOOP, +#else /* pciAddrBusToHost */ linuxTransAddrBusToHost, +#endif /* __sparc64__ */ #endif /* pciControlBridge */ NULL, |