diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 06:26:22 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 06:26:22 -0400 |
commit | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (patch) | |
tree | ceba46966a5a1112a05d257d8ecb25ae5eee95e0 /drivers/scsi/mac_scsi.c | |
parent | 364f6c717deef4a3ac4982e670fa9846b43cd060 (diff) | |
parent | ee98689be1b054897ff17655008c3048fe88be94 (diff) |
Automatic merge with /usr/src/ntfs-2.6.git.
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, |