Index: src/atichip.h
===================================================================
RCS file: /cvs/xorg/driver/xf86-video-ati/src/atichip.h,v
retrieving revision 1.6
diff -u -r1.6 atichip.h
--- src/atichip.h	28 Feb 2006 00:52:53 -0000	1.6
+++ src/atichip.h	7 May 2006 11:26:29 -0000
@@ -53,6 +53,7 @@
     ATI_CHIP_68800_6,           /* Mach32 */
     ATI_CHIP_68800LX,           /* Mach32 */
     ATI_CHIP_68800AX,           /* Mach32 */
+    ATI_CHIP_Mach32,            /* Last among Mach32's */
 
 #endif /* AVOID_CPIO */
 
Index: src/atiprobe.c
===================================================================
RCS file: /cvs/xorg/driver/xf86-video-ati/src/atiprobe.c,v
retrieving revision 1.7
diff -u -r1.7 atiprobe.c
--- src/atiprobe.c	22 Mar 2006 22:30:14 -0000	1.7
+++ src/atiprobe.c	7 May 2006 11:26:31 -0000
@@ -1561,8 +1561,10 @@
             /* Next, look for sparse I/O Mach64's */
             for (i = 0;  (pVideo = xf86PciVideoInfo[i++]);  )
             {
+                Chip = ATIChipID(pVideo->chipType, pVideo->chipRev);
                 if ((pVideo->vendor != PCI_VENDOR_ATI) ||
                     (pVideo->chipType == PCI_CHIP_MACH32) ||
+                    (Chip < ATI_CHIP_Mach32 || Chip > ATI_CHIP_Mach64) ||
                     pVideo->size[1])
                     continue;
 
@@ -1724,8 +1726,8 @@
         for (i = 0;  (pVideo = xf86PciVideoInfo[i++]);  )
         {
             if ((pVideo->vendor != PCI_VENDOR_ATI) ||
-                (pVideo->chipType == PCI_CHIP_MACH32) ||
-                !pVideo->size[1])
+                (pVideo->chipType == PCI_CHIP_MACH32)  )
+//                !pVideo->size[1])
                 continue;
 
             /* Check for Rage128's, Radeon's and later adapters */