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

Merge branch 'master'

Browse source 
Conflicts:

	drivers/scsi/libata-scsi.c
	include/linux/libata.h
This commit is contained in:
Jeff Garzik 2006-04-11 12:51:40 -04:00
commit 10a5fd5e6b
500 changed files with 7856 additions and 7485 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/scsi/ata_piix.c
View file

@ -209,7 +209,6 @@ static struct scsi_host_template piix_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,