xserver: Branch 'master'

[Donnie Berkholz]

 hw/xfree86/os-support/bus/linuxPci.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree d812f486a01a6276aed7b4ebd3cd8eb8ddfe10d3 (from f057de4f73fa593fa3fc5f05f65b89e76273b158)
Author: Donnie Berkholz <donnie at supernova.(none)>
Date:   Wed Sep 20 15:39:39 2006 -0700

    Really fix sparc on 64-bit kernel/32-bit userland.
    
    Commit b3a3020fd018df8bc5a8193d36e1a1c7ae8af8ba used a sparc64 ifdef instead of
    sparc. But for 32-bit userland, __sparc64__ is not defined so the wrong code is
    used.

diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index a97e6f0..c6dad1f 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -85,7 +85,7 @@ static pciBusFuncs_t linuxFuncs0 = {
 /* 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__)
+#if defined(__sparc__)
 /* pciAddrBusToHost */  pciAddrNOOP,
 #else
 /* pciAddrBusToHost */	linuxTransAddrBusToHost,