From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 6 Jan 2006 17:01:25 +0000 (-0800)
Subject: Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.16-rc1~936^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d99cf9d679a520d67f81d805b7cb91c68e1847f0;p=linux-2.6-omap-h63xx.git

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

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

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

d99cf9d679a520d67f81d805b7cb91c68e1847f0
diff --cc drivers/scsi/ata_piix.c
index f7963034002,4b647eefc9a..557788ec4ee
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@@ -187,9 -185,6 +187,8 @@@ static struct scsi_host_template piix_s
  	.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,
  };
  
  static const struct ata_port_operations piix_pata_ops = {