Signed-off-by: Andrew Morton --- drivers/ata/ata_piix.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN drivers/ata/ata_piix.c~gregkh-pci-pci-duplicate-ids-ata_piix drivers/ata/ata_piix.c --- a/drivers/ata/ata_piix.c~gregkh-pci-pci-duplicate-ids-ata_piix +++ a/drivers/ata/ata_piix.c @@ -194,12 +194,8 @@ static const struct pci_device_id piix_p /* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */ { 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, { 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - /* Intel ICH5 */ - { 0x8086, 0x24DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 }, /* C-ICH (i810E2) */ { 0x8086, 0x245B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - /* ESB (855GME/875P + 6300ESB) UDMA 100 */ - { 0x8086, 0x25A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, /* ICH6 (and 6) (i915) UDMA 100 */ { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, /* ICH7/7-R (i945, i975) UDMA 100*/ _