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_uli.c | |
parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/scsi/sata_uli.c')
-rw-r--r-- | drivers/scsi/sata_uli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c index 9635ca700977..37a487b7d655 100644 --- a/drivers/scsi/sata_uli.c +++ b/drivers/scsi/sata_uli.c | |||
@@ -75,11 +75,11 @@ static struct scsi_host_template uli_sht = { | |||
75 | .name = DRV_NAME, | 75 | .name = DRV_NAME, |
76 | .ioctl = ata_scsi_ioctl, | 76 | .ioctl = ata_scsi_ioctl, |
77 | .queuecommand = ata_scsi_queuecmd, | 77 | .queuecommand = ata_scsi_queuecmd, |
78 | .eh_timed_out = ata_scsi_timed_out, | ||
78 | .eh_strategy_handler = ata_scsi_error, | 79 | .eh_strategy_handler = ata_scsi_error, |
79 | .can_queue = ATA_DEF_QUEUE, | 80 | .can_queue = ATA_DEF_QUEUE, |
80 | .this_id = ATA_SHT_THIS_ID, | 81 | .this_id = ATA_SHT_THIS_ID, |
81 | .sg_tablesize = LIBATA_MAX_PRD, | 82 | .sg_tablesize = LIBATA_MAX_PRD, |
82 | .max_sectors = ATA_MAX_SECTORS, | ||
83 | .cmd_per_lun = ATA_SHT_CMD_PER_LUN, | 83 | .cmd_per_lun = ATA_SHT_CMD_PER_LUN, |
84 | .emulated = ATA_SHT_EMULATED, | 84 | .emulated = ATA_SHT_EMULATED, |
85 | .use_clustering = ATA_SHT_USE_CLUSTERING, | 85 | .use_clustering = ATA_SHT_USE_CLUSTERING, |