--- xf86-video-ati-6.6.2/src/atiprobe.c.jx	2006-08-24 20:08:17.000000000 -0400
+++ xf86-video-ati-6.6.2/src/atiprobe.c	2006-09-22 14:30:18.000000000 -0400
@@ -1000,7 +1000,6 @@
     ATIGDev                *ATIGDevs = NULL, *pATIGDev;
     ScrnInfoPtr            pScreenInfo;
     Bool                   ProbeSuccess = FALSE;
-    Bool                   DoRage128 = FALSE, DoRadeon = FALSE;
     int                    i, j, k;
     int                    nGDev, nATIGDev = -1, nATIPtr = 0;
     int                    Chipset;
@@ -1111,13 +1110,14 @@
                 ATIGDevs = NULL;
             }
         }
-
-        if (xf86MatchDevice(R128_NAME, NULL) > 0)
-            DoRage128 = TRUE;
-        if (xf86MatchDevice(RADEON_NAME, NULL) > 0)
-            DoRadeon = TRUE;
     }
 
+    if (RADEONProbe(pDriver, flags))
+	return TRUE;
+
+    if (R128Probe(pDriver, flags))
+	return TRUE;
+
 #ifndef AVOID_CPIO
 
     /*
@@ -1737,14 +1737,7 @@
             /* Check for Rage128's, Radeon's and later adapters */
             Chip = ATIChipID(pVideo->chipType, pVideo->chipRev);
             if (Chip > ATI_CHIP_Mach64)
-            {
-                if (Chip <= ATI_CHIP_Rage128)
-                    DoRage128 = TRUE;
-                else if (Chip <= ATI_CHIP_Radeon)
-                    DoRadeon = TRUE;
-
                 continue;
-            }
 
             if (!nATIGDev)
                 continue;
@@ -2330,13 +2323,5 @@
 
     xfree(ATIPtrs);
 
-    /* Call Rage 128 driver probe */
-    if (DoRage128 && R128Probe(pDriver, flags))
-        ProbeSuccess = TRUE;
-
-    /* Call Radeon driver probe */
-    if (DoRadeon && RADEONProbe(pDriver, flags))
-        ProbeSuccess = TRUE;
-
     return ProbeSuccess;
 }