diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2006-09-15 15:26:57 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2006-09-15 15:26:57 -0400 |
| commit | 49a70c8570b03aff8239324a2474918a6fbc52a0 (patch) | |
| tree | 9eeb961e7bdb0e37c135f14689cb0bcf280c840c /hw/xfree86/os-support/bus/linuxPci.c | |
| parent | d1110c5c83a7f439158f369ab2f3ae614fa9d2a5 (diff) | |
| parent | 05231e336db8f959c15dda518641976f061df1a6 (diff) | |
Merge branch 'master' into my-XACE-modularXACE-modular
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 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, |