diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
| commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
| tree | f4421227b3065e786c9041cf0ce0073a249e011b /drivers/scsi/mac_scsi.c | |
| parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Auto merge with /home/aegl/GIT/linus
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, |