Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 Imakefile
--- Imakefile	15 Dec 2004 08:47:20 -0000	1.6.2.1
+++ Imakefile	25 Apr 2005 20:35:08 -0000
@@ -87,16 +87,8 @@
  * Currently, ATIAvoidNonPCI needs to be set to YES for those platforms that do
  * not tolerate PCI master aborts.
  */
-/* 
- * Some older IA64 platforms don't mind if we are poking around in PIO
- * space, however the newer once do an MC if we poke any registers outside
- * a small band in the VGA range. Therefore it is best not to touch PIO
- * space in IA64 at all. 
- * This will disenfranchise Mach8/32 users but these cards are ISA and
- * there is no IA64 with ISA slots. It is not recommended to use ISA
- * adaptor boards for those cards.
- */
 #if defined(i386Architecture) || \
+    defined(ia64Architecture) || \
     defined(AMD64Architecture) || \
     defined(AlphaArchitecture)
 # ifndef ATIAvoidCPIO
@@ -107,7 +99,18 @@
 # define ATIAvoidCPIO YES
 #endif
 
-#if defined(PpcArchitecture)
+/* 
+ * Some older IA64 platforms don't mind if we are poking around in PIO
+ * space, however the newer once do an MC if we poke any registers outside
+ * a small band in the VGA range. Therefore it is best not to probe for
+ * ISA cards.
+ * This will disenfranchise Mach8/32 users since these cards are ISA but
+ * there is no IA64 with ISA slots. It is not recommended to use ISA
+ * adaptor boards for those cards.
+ * Therefore, we disable non-PCI probing on ia64.
+ */
+#if defined(PpcArchitecture) || \
+    defined(ia64Architecture)
 # undef ATIAvoidNonPCI
 # define ATIAvoidNonPCI YES
 #elif !defined(ATIAvoidNonPCI)