diff options
author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /drivers/scsi/sata_vsc.c | |
parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/scsi/sata_vsc.c')
-rw-r--r-- | drivers/scsi/sata_vsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c index e484e8db6810..b574379a7a82 100644 --- a/drivers/scsi/sata_vsc.c +++ b/drivers/scsi/sata_vsc.c | |||
@@ -251,11 +251,11 @@ static struct scsi_host_template vsc_sata_sht = { | |||
251 | .name = DRV_NAME, | 251 | .name = DRV_NAME, |
252 | .ioctl = ata_scsi_ioctl, | 252 | .ioctl = ata_scsi_ioctl, |
253 | .queuecommand = ata_scsi_queuecmd, | 253 | .queuecommand = ata_scsi_queuecmd, |
254 | .eh_timed_out = ata_scsi_timed_out, | ||
254 | .eh_strategy_handler = ata_scsi_error, | 255 | .eh_strategy_handler = ata_scsi_error, |
255 | .can_queue = ATA_DEF_QUEUE, | 256 | .can_queue = ATA_DEF_QUEUE, |
256 | .this_id = ATA_SHT_THIS_ID, | 257 | .this_id = ATA_SHT_THIS_ID, |
257 | .sg_tablesize = LIBATA_MAX_PRD, | 258 | .sg_tablesize = LIBATA_MAX_PRD, |
258 | .max_sectors = ATA_MAX_SECTORS, | ||
259 | .cmd_per_lun = ATA_SHT_CMD_PER_LUN, | 259 | .cmd_per_lun = ATA_SHT_CMD_PER_LUN, |
260 | .emulated = ATA_SHT_EMULATED, | 260 | .emulated = ATA_SHT_EMULATED, |
261 | .use_clustering = ATA_SHT_USE_CLUSTERING, | 261 | .use_clustering = ATA_SHT_USE_CLUSTERING, |