diff options
| author | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
| commit | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (patch) | |
| tree | eb4aff9a5c2b7d04ce09a3717bb1dd4a79fe7595 /drivers/scsi/mac_scsi.c | |
| parent | bbc0274e9bb2e3f1d724d445a2bd32566b9b66f7 (diff) | |
| parent | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-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, |