xserver: Branch 'master'

[David Nusinow]

 hw/xfree86/common/xf86Init.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree bf0883ae5081bd75569115a3eb27c6d3d336c9f2 (from 4eed88af8b7b6881b44ccf9f4a5c5875af6d2b78)
Author: David Nusinow <dnusinow at debian.org>
Date:   Sat Aug 25 14:53:17 2007 -0400

    Fix bug in debugging info related to pci-rework merge

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index aa46032..72f7150 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -315,7 +315,7 @@ probe_devices_from_device_sections(Drive
 
 #ifdef DEBUG
 		ErrorF("%s: card at %d:%d:%d is claimed by a Device section\n",
-		       drvp->driverName, pPci->bus, pPci->device, pPci->func);
+		       drvp->driverName, pPci->bus, pPci->dev, pPci->func);
 #endif
 	
 		/* Allocate an entry in the lists to be returned */