Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14719f32 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "PCI: remove duplicate device id from ata_piix" 



This reverts commit b1105635.

It was incorrect, the proper fix is coming through the SATA tree, sorry
about that.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f7feaca7

drivers/ata/ata_piix.c

+4 −0
Original line number Diff line number Diff line
@@ -191,8 +191,12 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	/* 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*/