summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sata_nv.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-10 13:09:37 +0100
committerJeff Garzik <jgarzik@pobox.com>2006-02-10 13:09:37 +0100
commitca7d5e42d783e54f0057317c9226262d68ab7717 (patch)
tree209751546842e1200bfbd2fd5144e1727ab18c86 /drivers/scsi/sata_nv.c
parentMerge branch 'upstream' (diff)
parent[PATCH] ahci: separate out ahci_fill_cmd_slot() (diff)
downloadlinux-ca7d5e42d783e54f0057317c9226262d68ab7717.tar.xz
linux-ca7d5e42d783e54f0057317c9226262d68ab7717.zip
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_nv.c')
-rw-r--r--drivers/scsi/sata_nv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 945194b76998..94dc2e1a8f30 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -229,6 +229,7 @@ static struct scsi_host_template nv_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,