--- linux-240t5-orig/drivers/scsi/scsi_ioctl.c	Fri Jul 28 12:27:04 2000
+++ linux/drivers/scsi/scsi_ioctl.c	Sun Aug 20 12:27:30 2000
@@ -24,6 +24,7 @@
 #define START_STOP_TIMEOUT		(60 * HZ)
 #define MOVE_MEDIUM_TIMEOUT		(5 * 60 * HZ)
 #define READ_ELEMENT_STATUS_TIMEOUT	(5 * 60 * HZ)
+#define READ_DEFECT_DATA_TIMEOUT	(60 * HZ )  /* ZIP-250 on parallel port takes as long! */
 
 #define MAX_BUF PAGE_SIZE
 
@@ -283,6 +284,10 @@
 	case READ_ELEMENT_STATUS:
 		timeout = READ_ELEMENT_STATUS_TIMEOUT;
 		retries = NORMAL_RETRIES;
+		break;
+	case READ_DEFECT_DATA:
+		timeout = READ_DEFECT_DATA_TIMEOUT;
+		retries = 1;
 		break;
 	default:
 		timeout = IOCTL_NORMAL_TIMEOUT;
--- linux-240t5-orig/drivers/scsi/imm.h	Fri Jul 28 12:27:04 2000
+++ linux/drivers/scsi/imm.h	Sun Aug 20 12:39:15 2000
@@ -10,7 +10,7 @@
 #ifndef _IMM_H
 #define _IMM_H
 
-#define   IMM_VERSION   "2.03 (for Linux 2.0.0)"
+#define   IMM_VERSION   "2.04 (for Linux 2.4.0)"
 
 /* 
  * 10 Apr 1998 (Good Friday) - Received EN144302 by email from Iomega.
@@ -59,6 +59,7 @@
  *    CONFIG_SCSI_PPA_HAVE_PEDANTIC => CONFIG_SCSI_IZIP_EPP16
  *    added CONFIG_SCSI_IZIP_SLOW_CTR option
  *                                                      [2.03]
+ *  Fix kernel panic on scsi timeout.		20Aug00 [2.04]
  */
 /* ------ END OF USER CONFIGURABLE PARAMETERS ----- */
 
@@ -171,6 +172,7 @@
                 eh_device_reset_handler:        NULL,                   \
                 eh_bus_reset_handler:           imm_reset,              \
                 eh_host_reset_handler:          imm_reset,              \
+		use_new_eh_code:		1,			\
 		bios_param:		        imm_biosparam,		\
 		this_id:			7,			\
 		sg_tablesize:			SG_ALL,			\
--- linux-240t5-orig/drivers/scsi/ppa.h	Fri Jul 28 12:27:04 2000
+++ linux/drivers/scsi/ppa.h	Sun Aug 20 12:19:21 2000
@@ -10,7 +10,7 @@
 #ifndef _PPA_H
 #define _PPA_H
 
-#define   PPA_VERSION   "2.04 (for Linux 2.2.x)"
+#define   PPA_VERSION   "2.05 (for Linux 2.2.x)"
 
 /* 
  * this driver has been hacked by Matteo Frigo (athena@theory.lcs.mit.edu)
@@ -57,6 +57,7 @@
  *  by Peter Cherriman <pjc@ecs.soton.ac.uk> and
  *     Tim Waugh <twaugh@redhat.com>
  *                                                      [2.04]
+ * Fix kernel panic on scsi timeout, 2000-08-18		[2.05]
  */
 /* ------ END OF USER CONFIGURABLE PARAMETERS ----- */
 
@@ -169,6 +170,7 @@
 		eh_device_reset_handler:	NULL,			\
 		eh_bus_reset_handler:		ppa_reset,		\
 		eh_host_reset_handler:		ppa_reset,		\
+		use_new_eh_code:		1,			\
 		bios_param:			ppa_biosparam,		\
 		this_id:			-1,			\
 		sg_tablesize:			SG_ALL,			\