diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-23 01:13:54 +0100 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-23 01:13:54 +0100 |
commit | f01c18456993bab43067b678f56c87ca954aa43b (patch) | |
tree | 3e0cd0cdf1a57618202b46a7126125902e3ab832 /drivers/scsi/pdc_adma.c | |
parent | Merge branch 'master' (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa (diff) | |
download | linux-f01c18456993bab43067b678f56c87ca954aa43b.tar.xz linux-f01c18456993bab43067b678f56c87ca954aa43b.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/pdc_adma.c')
-rw-r--r-- | drivers/scsi/pdc_adma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c index b7b2300f6768..3c85c4b66e19 100644 --- a/drivers/scsi/pdc_adma.c +++ b/drivers/scsi/pdc_adma.c @@ -143,7 +143,6 @@ static struct scsi_host_template adma_ata_sht = { .name = DRV_NAME, .ioctl = ata_scsi_ioctl, .queuecommand = ata_scsi_queuecmd, - .eh_timed_out = ata_scsi_timed_out, .eh_strategy_handler = ata_scsi_error, .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, |