From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 16 Nov 2005 16:07:14 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8bb6030b62a70edc0cb8129338f83e9063aeaf92;hp=-c;p=deliverable%2Flinux.git

Merge branch 'upstream-fixes'
---

8bb6030b62a70edc0cb8129338f83e9063aeaf92
diff --combined drivers/scsi/ata_piix.c
index 7a1ed94492f9,333d69dd84ef..887b2b9ee4aa
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@@ -50,7 -50,7 +50,7 @@@
  #include <linux/libata.h>
  
  #define DRV_NAME	"ata_piix"
- #define DRV_VERSION	"1.04"
+ #define DRV_VERSION	"1.05"
  
  enum {
  	PIIX_IOCFG		= 0x54, /* IDE I/O configuration register */
@@@ -78,7 -78,9 +78,7 @@@
  	ich5_sata		= 1,
  	piix4_pata		= 2,
  	ich6_sata		= 3,
 -	ich6_sata_rm		= 4,
 -	ich7_sata		= 5,
 -	esb2_sata		= 6,
 +	ich6_sata_ahci		= 4,
  
  	PIIX_AHCI_DEVICE	= 6,
  };
@@@ -109,11 -111,11 +109,11 @@@ static const struct pci_device_id piix_
  	{ 0x8086, 0x25a3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
  	{ 0x8086, 0x25b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
  	{ 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
 -	{ 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_rm },
 -	{ 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_rm },
 -	{ 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
 -	{ 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
 -	{ 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, esb2_sata },
 +	{ 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
 +	{ 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
 +	{ 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
 +	{ 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
 +	{ 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
  
  	{ }	/* terminate list */
  };
@@@ -256,7 -258,31 +256,7 @@@ static struct ata_port_info piix_port_i
  		.port_ops	= &piix_sata_ops,
  	},
  
 -	/* ich6_sata_rm */
 -	{
 -		.sht		= &piix_sht,
 -		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST |
 -				  PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR |
 -				  ATA_FLAG_SLAVE_POSS | PIIX_FLAG_AHCI,
 -		.pio_mask	= 0x1f,	/* pio0-4 */
 -		.mwdma_mask	= 0x07, /* mwdma0-2 */
 -		.udma_mask	= 0x7f,	/* udma0-6 */
 -		.port_ops	= &piix_sata_ops,
 -	},
 -
 -	/* ich7_sata */
 -	{
 -		.sht		= &piix_sht,
 -		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST |
 -				  PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR |
 -				  ATA_FLAG_SLAVE_POSS | PIIX_FLAG_AHCI,
 -		.pio_mask	= 0x1f,	/* pio0-4 */
 -		.mwdma_mask	= 0x07, /* mwdma0-2 */
 -		.udma_mask	= 0x7f,	/* udma0-6 */
 -		.port_ops	= &piix_sata_ops,
 -	},
 -
 -	/* esb2_sata */
 +	/* ich6_sata_ahci */
  	{
  		.sht		= &piix_sht,
  		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_SRST |