diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 09:44:00 -0400 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 09:44:00 -0400 |
commit | d039ba24f135147f60a13bcaa768189a5b773b6e (patch) | |
tree | 444b7596ab8312b5954d15c3135052a7c09c6fbe /drivers/scsi/mac_scsi.c | |
parent | 72e3148a6e987974e3e949c5668e5ca812d7c818 (diff) | |
parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/scsi/mac_scsi.c')
-rw-r--r-- | drivers/scsi/mac_scsi.c | 2 |
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 = { | |||
591 | .queuecommand = macscsi_queue_command, | 591 | .queuecommand = macscsi_queue_command, |
592 | .eh_abort_handler = macscsi_abort, | 592 | .eh_abort_handler = macscsi_abort, |
593 | .eh_bus_reset_handler = macscsi_bus_reset, | 593 | .eh_bus_reset_handler = macscsi_bus_reset, |
594 | .eh_device_reset_handler = macscsi_device_reset, | ||
595 | .eh_host_reset_handler = macscsi_host_reset, | ||
596 | .can_queue = CAN_QUEUE, | 594 | .can_queue = CAN_QUEUE, |
597 | .this_id = 7, | 595 | .this_id = 7, |
598 | .sg_tablesize = SG_ALL, | 596 | .sg_tablesize = SG_ALL, |