xserver: Branch 'server-1.2-branch'

[Adam Jackson]

 hw/xfree86/os-support/bus/linuxPci.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

New commits:
diff-tree 93ae22b16bde0db10cdf6a58c793f973b1bf31e2 (from 816b95be3748162e4eae90a103035aa14dfcde48)
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri Nov 3 18:32:48 2006 +0100

    Fixing mach64 driver bailing out on ia64
    
    Mach64 driver bails out on ia64 because it cannot map device
    memory. It turns out that some bogus and unneeded code attempts
    to find the root bridge of the device and fails to do so proberly
    as there this host-to-pci bridge is not existant. This code has
    been around for years although it completely unclear what it had
    been intended for. Fixing this by eliminating the bogus code.
    (cherry picked from c1828a8ff51c8db326c47e6710f4f42fab94fb6d commit)

diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index c6dad1f..d603087 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -524,9 +524,7 @@ linuxMapPci(int ScreenNum, int Flags, PC
 
 	xf86InitVidMem();
 
-	pPCI = xf86GetPciHostConfigFromTag(Tag);
-
-	if (((fd = linuxPciOpenFile(pPCI ? pPCI->tag : 0,FALSE)) < 0) ||
+	if (((fd = linuxPciOpenFile(Tag ,FALSE)) < 0) ||
 	    (ioctl(fd, mmap_ioctl, 0) < 0))
 	    break;