diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 19:17:27 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 19:17:27 -0500 |
commit | 14719f325e1cd4ff757587e9a221ebaf394563ee (patch) | |
tree | f6be6cccda9a249b0ae4b29608b77daa581086b0 /drivers | |
parent | f7feaca77d6ad6bcfcc88ac54e3188970448d6fe (diff) |
Revert "PCI: remove duplicate device id from ata_piix"
This reverts commit b11056355ea149c37edf0ef54976a49f5258cd54.
It was incorrect, the proper fix is coming through the SATA tree, sorry
about that.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ata/ata_piix.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index 267241a59080..47701b286f8b 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
@@ -191,8 +191,12 @@ static const struct pci_device_id piix_pci_tbl[] = { | |||
191 | /* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */ | 191 | /* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */ |
192 | { 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 192 | { 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, |
193 | { 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 193 | { 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, |
194 | /* Intel ICH5 */ | ||
195 | { 0x8086, 0x24DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 }, | ||
194 | /* C-ICH (i810E2) */ | 196 | /* C-ICH (i810E2) */ |
195 | { 0x8086, 0x245B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 197 | { 0x8086, 0x245B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, |
198 | /* ESB (855GME/875P + 6300ESB) UDMA 100 */ | ||
199 | { 0x8086, 0x25A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | ||
196 | /* ICH6 (and 6) (i915) UDMA 100 */ | 200 | /* ICH6 (and 6) (i915) UDMA 100 */ |
197 | { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, | 201 | { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, |
198 | /* ICH7/7-R (i945, i975) UDMA 100*/ | 202 | /* ICH7/7-R (i945, i975) UDMA 100*/ |