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_sis.c | |
| parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
| parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/scsi/sata_sis.c')
| -rw-r--r-- | drivers/scsi/sata_sis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c index 2df8c5632ac3..7fd45f86de99 100644 --- a/drivers/scsi/sata_sis.c +++ b/drivers/scsi/sata_sis.c | |||
| @@ -87,11 +87,11 @@ static struct scsi_host_template sis_sht = { | |||
| 87 | .name = DRV_NAME, | 87 | .name = DRV_NAME, |
| 88 | .ioctl = ata_scsi_ioctl, | 88 | .ioctl = ata_scsi_ioctl, |
| 89 | .queuecommand = ata_scsi_queuecmd, | 89 | .queuecommand = ata_scsi_queuecmd, |
| 90 | .eh_timed_out = ata_scsi_timed_out, | ||
| 90 | .eh_strategy_handler = ata_scsi_error, | 91 | .eh_strategy_handler = ata_scsi_error, |
| 91 | .can_queue = ATA_DEF_QUEUE, | 92 | .can_queue = ATA_DEF_QUEUE, |
| 92 | .this_id = ATA_SHT_THIS_ID, | 93 | .this_id = ATA_SHT_THIS_ID, |
| 93 | .sg_tablesize = ATA_MAX_PRD, | 94 | .sg_tablesize = ATA_MAX_PRD, |
| 94 | .max_sectors = ATA_MAX_SECTORS, | ||
| 95 | .cmd_per_lun = ATA_SHT_CMD_PER_LUN, | 95 | .cmd_per_lun = ATA_SHT_CMD_PER_LUN, |
| 96 | .emulated = ATA_SHT_EMULATED, | 96 | .emulated = ATA_SHT_EMULATED, |
| 97 | .use_clustering = ATA_SHT_USE_CLUSTERING, | 97 | .use_clustering = ATA_SHT_USE_CLUSTERING, |