forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream'

Browse source 
Conflicts:

	drivers/scsi/sata_vsc.c
This commit is contained in:
Jeff Garzik 2006-03-24 09:24:04 -05:00
commit 11ed56fb78
2017 changed files with 122697 additions and 93122 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/scsi/sata_promise.c
View file

@ -112,7 +112,6 @@ static struct scsi_host_template pdc_ata_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 = ATA_DEF_QUEUE,
.this_id = ATA_SHT_THIS_ID,