xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 933ffcdf7d2eaaf7caabfe6f861f04bcb149918f
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Mar 28 17:53:55 2008 -0400

    Compile fix.

diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
index 7e26722..8dda35a 100644
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/hw/xfree86/ddc/xf86DDC.c
@@ -119,7 +119,7 @@ DDC2MakeDevice(I2CBusPtr pBus, int address, char *name)
 
 	dev->pI2CBus = pBus;
 	if (!xf86I2CDevInit(dev)) {
-	    xf86DrvMsg(scrnIndex, X_PROBED, "No DDC2 device\n");
+	    xf86DrvMsg(pBus->scrnIndex, X_PROBED, "No DDC2 device\n");
 	    return NULL;
 	}
     }