xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/r128_probe.c   |    2 +-
 src/radeon_probe.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d055b9e800ae50d08cca9db75fc666ce1da9ab52
Author: Dave Airlie <airlied at linux.ie>
Date:   Sat Feb 16 09:13:43 2008 +1000

    r128/radeon: hopeful fix for non pci access code

diff --git a/src/r128_probe.c b/src/r128_probe.c
index 431efef..1b07ebd 100644
--- a/src/r128_probe.c
+++ b/src/r128_probe.c
@@ -332,7 +332,7 @@ R128Probe(DriverPtr drv, int flags)
     if (flags & PROBE_DETECT)
 	foundScreen = TRUE;
     else for (i = 0; i < numUsed; i++) {
-	if (r128_get_scrninfo(entity_num))
+	if (r128_get_scrninfo(i))
 	    foundScreen = TRUE;
     }
 
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index 936d43f..fc621c7 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -180,7 +180,7 @@ RADEONProbe(DriverPtr drv, int flags)
 	foundScreen = TRUE;
     } else {
 	for (i = 0; i < numUsed; i++) {
-	    if (radeon_get_scrninfo(entity_num))
+	    if (radeon_get_scrninfo(i))
 		foundScreen = TRUE;
 	}
     }