sugar/linux
1
0
Fork 0
Code Activity

Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block

Browse Source 
Manual fixup for merge with Jens' "Suspend support for libata", commit
ID 9b84754866.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Linus Torvalds
2006-01-06 09:01:25 -08:00
parent 7ed40918a3 e650c305ec
commit d99cf9d679
50 changed files with 707 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/scsi/ata_piix.c
View File

@@ -187,7 +187,6 @@ static struct scsi_host_template piix_sht = {
.dma_boundary = ATA_DMA_BOUNDARY,
.slave_configure = ata_scsi_slave_config,
.bios_param = ata_std_bios_param,
.ordered_flush = 1,
.resume = ata_scsi_device_resume,
.suspend = ata_scsi_device_suspend,
};