diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 16:17:27 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 16:17:27 -0800 |
| commit | 14719f325e1cd4ff757587e9a221ebaf394563ee (patch) | |
| tree | f6be6cccda9a249b0ae4b29608b77daa581086b0 | |
| parent | f7feaca77d6ad6bcfcc88ac54e3188970448d6fe (diff) | |
| download | kernel_samsung_smdk4412-14719f325e1cd4ff757587e9a221ebaf394563ee.tar.gz kernel_samsung_smdk4412-14719f325e1cd4ff757587e9a221ebaf394563ee.tar.bz2 kernel_samsung_smdk4412-14719f325e1cd4ff757587e9a221ebaf394563ee.zip | |
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>
| -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 267241a5908..47701b286f8 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[] = { /* 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*/ |