Resubmit after removing duplicate entry.
Signed-off-by: ?Jason Gaston <[email protected]>
--- linux-2.6.16-rc1/drivers/scsi/ata_piix.c.orig 2006-01-17 08:45:23.711123752 -0800
+++ linux-2.6.16-rc1/drivers/scsi/ata_piix.c 2006-01-17 08:46:32.645644112 -0800
@@ -157,6 +157,9 @@
{ 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 },
+ { 0x8086, 0x2820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
+ { 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
+ { 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
{ } /* terminate list */
};
--- linux-2.6.16-rc1/drivers/pci/quirks.c.orig 2006-01-17 08:46:41.357319736 -0800
+++ linux-2.6.16-rc1/drivers/pci/quirks.c 2006-01-17 08:49:23.747632656 -0800
@@ -1142,6 +1142,9 @@
case 0x27c4:
ich = 7;
break;
+ case 0x2828: /* ICH8M */
+ ich = 8;
+ break;
default:
/* we do not handle this PCI device */
return;
@@ -1161,7 +1164,7 @@
else
return; /* not in combined mode */
} else {
- WARN_ON((ich != 6) && (ich != 7));
+ WARN_ON((ich != 6) && (ich != 7) && (ich != 8));
tmp &= 0x3; /* interesting bits 1:0 */
if (tmp & (1 << 0))
comb = (1 << 2); /* PATA port 0, SATA port 1 */
Jason Gaston wrote:
> Resubmit after removing duplicate entry.
>
> Signed-off-by: Jason Gaston <[email protected]>
applied