xserver: Branch 'master'

[Jesse Barnes]

 hw/xfree86/os-support/bus/linuxPci.c |    6 ++++++
 1 files changed, 6 insertions(+)

New commits:
diff-tree b3a3020fd018df8bc5a8193d36e1a1c7ae8af8ba (from 65256109bb8f5a26704ed960e1dd113981df5787)
Author: Jesse Barnes <jbarnes at nietzche.virtuousgeek.org>
Date:   Sun Sep 10 11:13:18 2006 -0700

    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.

diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index a3c07f3..a97e6f0 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,