summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mac_scsi.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-06-20 13:12:51 -0500
committerSteve French <sfrench@us.ibm.com>2005-06-20 13:12:51 -0500
commit58aab753de605c14b9878a897e7349c3063afeff (patch)
treec9339c8cbcaae4dfe2232618fe6de1398d05455e /drivers/scsi/mac_scsi.c
parent5893a65711164e42fea4a58bb8adf47c2fac8a4b (diff)
parent8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff)
downloadlinux-58aab753de605c14b9878a897e7349c3063afeff.tar.gz
linux-58aab753de605c14b9878a897e7349c3063afeff.tar.bz2
linux-58aab753de605c14b9878a897e7349c3063afeff.zip
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'drivers/scsi/mac_scsi.c')
-rw-r--r--drivers/scsi/mac_scsi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index d5fd17ef74db..92d2c8379abf 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -591,8 +591,6 @@ static Scsi_Host_Template driver_template = {
.queuecommand = macscsi_queue_command,
.eh_abort_handler = macscsi_abort,
.eh_bus_reset_handler = macscsi_bus_reset,
- .eh_device_reset_handler = macscsi_device_reset,
- .eh_host_reset_handler = macscsi_host_reset,
.can_queue = CAN_QUEUE,
.this_id = 7,
.sg_tablesize = SG_ALL,