diff -urNp --exclude CVS --exclude BitKeeper x-ref/drivers/scsi/qla2xxx/qla2x00.h x/drivers/scsi/qla2xxx/qla2x00.h
--- x-ref/drivers/scsi/qla2xxx/qla2x00.h	2003-05-11 05:37:49.000000000 +0200
+++ x/drivers/scsi/qla2xxx/qla2x00.h	2003-05-11 05:39:13.000000000 +0200
@@ -2831,20 +2831,6 @@ void qla2x00_setup(char *s);
 #define TEMPLATE_MAX_SECTORS 
 #endif
 /*
- * highmem_io
- *
- */
-#if defined CONFIG_HIGHIO || LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18)
-/* Assume RedHat Distribution with its different HIGHIO conventions. */
-#define TEMPLATE_HIGHMEM_IO        can_dma_32: 1,
-#else
-#define TEMPLATE_HIGHMEM_IO	   highmem_io : 1,
-#endif
-#else
-#define TEMPLATE_HIGHMEM_IO 
-#endif
-/*
  * use_new_eh_code
  *
  */
@@ -2921,8 +2907,9 @@ TEMPLATE_PROC_DIR 	  	 	 	 	 	\
 	unchecked_isa_dma: 0,	/* no memory DMA restrictions */\
 TEMPLATE_USE_NEW_EH_CODE 	 	 	 	 	\
 TEMPLATE_MAX_SECTORS						\
-TEMPLATE_HIGHMEM_IO						\
 TEMPLATE_EMULATED						\
+	highmem_io: 1,						\
+	vary_io: 1,						\
 	use_clustering: ENABLE_CLUSTERING			\
 }