diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-10 07:09:37 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-10 07:09:37 -0500 |
commit | ca7d5e42d783e54f0057317c9226262d68ab7717 (patch) | |
tree | 209751546842e1200bfbd2fd5144e1727ab18c86 /drivers/scsi/pdc_adma.c | |
parent | a0819750024a0056d760a936d72f76882a7e393f (diff) | |
parent | cc9278ed5e992122a654a3f762561ee5e013810f (diff) |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/pdc_adma.c')
-rw-r--r-- | drivers/scsi/pdc_adma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c index 2dca6c53868a..0f7e45a39fd9 100644 --- a/drivers/scsi/pdc_adma.c +++ b/drivers/scsi/pdc_adma.c | |||
@@ -143,6 +143,7 @@ static struct scsi_host_template adma_ata_sht = { | |||
143 | .name = DRV_NAME, | 143 | .name = DRV_NAME, |
144 | .ioctl = ata_scsi_ioctl, | 144 | .ioctl = ata_scsi_ioctl, |
145 | .queuecommand = ata_scsi_queuecmd, | 145 | .queuecommand = ata_scsi_queuecmd, |
146 | .eh_timed_out = ata_scsi_timed_out, | ||
146 | .eh_strategy_handler = ata_scsi_error, | 147 | .eh_strategy_handler = ata_scsi_error, |
147 | .can_queue = ATA_DEF_QUEUE, | 148 | .can_queue = ATA_DEF_QUEUE, |
148 | .this_id = ATA_SHT_THIS_ID, | 149 | .this_id = ATA_SHT_THIS_ID, |