1
0

Merge branch 'master'

This commit is contained in:
Jeff Garzik
2006-03-22 19:13:54 -05:00
510 changed files with 43915 additions and 47882 deletions

View File

@@ -378,7 +378,6 @@ static struct scsi_host_template mv_sht = {
.name = DRV_NAME,
.ioctl = ata_scsi_ioctl,
.queuecommand = ata_scsi_queuecmd,
.eh_timed_out = ata_scsi_timed_out,
.eh_strategy_handler = ata_scsi_error,
.can_queue = MV_USE_Q_DEPTH,
.this_id = ATA_SHT_THIS_ID,