sugar/linux
1
0
Fork 0
Code Activity

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
parent c2a6585296 a145410dcc
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/sata_sis.c
View File

@@ -87,7 +87,6 @@ static struct scsi_host_template sis_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 = ATA_MAX_PRD,