[libata ata_piix] Update PCI quirk with new Intel SATA devices

And also make a note in ata_piix.c so this is not forgotten
in the future.

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 5f31f953a29589f35c6154dfb11771341f752125..3b6be057a1194690f75ef9c767e485fd7e928967 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -826,6 +826,7 @@ static void __init quirk_intel_ide_combined(struct pci_dev *pdev)
        case 0x24df:
        case 0x25a3:
        case 0x25b0:
+       case 0x2562:
                break;
        default:
                /* we do not handle this PCI device */

diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 89dc66faf1eac1aa549d61bad392b4b0c008e46e..f70cf92f36955025430bedd8a113f2bc21c30f4b 100644 (file)
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -67,6 +67,10 @@ static struct pci_device_id piix_pci_tbl[] = {
        { 0x8086, 0x25a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_pata },
 #endif
 
+       /* NOTE: The following PCI ids must be kept in sync with the
+        * list in drivers/pci/quirks.c.
+        */
+
        { 0x8086, 0x24d1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
        { 0x8086, 0x24df, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
        { 0x8086, 0x25a3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },