diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-13 00:13:48 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-13 00:13:48 -0500 |
commit | 3875e1945b55f0eb83fe7359614a801eeb716761 (patch) | |
tree | 4567aef3fb7d081cb7d7b7c9bcd94e0e44d39557 /drivers/scsi/sata_nv.c | |
parent | 587005de144acd3007b8e7f2a2a7c6add157c155 (diff) | |
parent | f1b318793dcd2d9ff6b5ac06e7762098fa079cee (diff) |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_nv.c')
-rw-r--r-- | drivers/scsi/sata_nv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c index 94dc2e1a8f30..5168db981dde 100644 --- a/drivers/scsi/sata_nv.c +++ b/drivers/scsi/sata_nv.c | |||
@@ -234,7 +234,6 @@ static struct scsi_host_template nv_sht = { | |||
234 | .can_queue = ATA_DEF_QUEUE, | 234 | .can_queue = ATA_DEF_QUEUE, |
235 | .this_id = ATA_SHT_THIS_ID, | 235 | .this_id = ATA_SHT_THIS_ID, |
236 | .sg_tablesize = LIBATA_MAX_PRD, | 236 | .sg_tablesize = LIBATA_MAX_PRD, |
237 | .max_sectors = ATA_MAX_SECTORS, | ||
238 | .cmd_per_lun = ATA_SHT_CMD_PER_LUN, | 237 | .cmd_per_lun = ATA_SHT_CMD_PER_LUN, |
239 | .emulated = ATA_SHT_EMULATED, | 238 | .emulated = ATA_SHT_EMULATED, |
240 | .use_clustering = ATA_SHT_USE_CLUSTERING, | 239 | .use_clustering = ATA_SHT_USE_CLUSTERING, |