diff -urNp qlogic/drivers/scsi/qla2xxx/qla2x00.h qlogic-2/drivers/scsi/qla2xxx/qla2x00.h
--- qlogic/drivers/scsi/qla2xxx/qla2x00.h	Tue Jul 16 18:00:26 2002
+++ qlogic-2/drivers/scsi/qla2xxx/qla2x00.h	Tue Jul 16 18:08:45 2002
@@ -2678,26 +2678,6 @@ void qla2x00_setup(char *s);
  * Device driver Interfaces to mid-level SCSI driver.
  */
 
-/* Kernel version specific template additions */
-
-/*
- * max_sectors
- *
- */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,8)
-#define TEMPLATE_MAX_SECTORS	max_sectors: 512,
-#else
-#define TEMPLATE_MAX_SECTORS 
-#endif
-/*
- * highmem_io
- *
- */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,7)
-#define TEMPLATE_HIGHMEM_IO	highmem_io: 1,
-#else
-#define TEMPLATE_HIGHMEM_IO 
-#endif
 /*
  * use_new_eh_code
  *
@@ -2737,9 +2717,9 @@ void qla2x00_setup(char *s);
 	present: 0,		/* number of 7xxx's present   */\
 	unchecked_isa_dma: 0,	/* no memory DMA restrictions */\
 	use_clustering: ENABLE_CLUSTERING,			\
-TEMPLATE_USE_NEW_EH_CODE 	 	 	 	 	\
-TEMPLATE_MAX_SECTORS						\
-TEMPLATE_HIGHMEM_IO						\
+	max_sectors: 512,					\
+	highmem_io: 1,						\
+	can_do_varyio: 1,					\
 	emulated: 0					        \
 }