1
0

Merge branch 'upstream'

This commit is contained in:
Jeff Garzik
2006-04-12 16:54:43 -04:00
503 changed files with 8139 additions and 7660 deletions

View File

@@ -201,7 +201,6 @@ static struct scsi_host_template nv_sht = {
.name = DRV_NAME,
.ioctl = ata_scsi_ioctl,
.queuecommand = ata_scsi_queuecmd,
.eh_strategy_handler = ata_scsi_error,
.can_queue = ATA_DEF_QUEUE,
.this_id = ATA_SHT_THIS_ID,
.sg_tablesize = LIBATA_MAX_PRD,