diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /drivers/ata/sata_mv.c | |
| parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
| parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/ata/sata_mv.c')
| -rw-r--r-- | drivers/ata/sata_mv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 8ec520885b95..3acf65e75eb2 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
| @@ -621,6 +621,9 @@ static const struct pci_device_id mv_pci_tbl[] = { | |||
| 621 | { PCI_VDEVICE(MARVELL, 0x5041), chip_504x }, | 621 | { PCI_VDEVICE(MARVELL, 0x5041), chip_504x }, |
| 622 | { PCI_VDEVICE(MARVELL, 0x5080), chip_5080 }, | 622 | { PCI_VDEVICE(MARVELL, 0x5080), chip_5080 }, |
| 623 | { PCI_VDEVICE(MARVELL, 0x5081), chip_508x }, | 623 | { PCI_VDEVICE(MARVELL, 0x5081), chip_508x }, |
| 624 | /* RocketRAID 1740/174x have different identifiers */ | ||
| 625 | { PCI_VDEVICE(TTI, 0x1740), chip_508x }, | ||
| 626 | { PCI_VDEVICE(TTI, 0x1742), chip_508x }, | ||
| 624 | 627 | ||
| 625 | { PCI_VDEVICE(MARVELL, 0x6040), chip_604x }, | 628 | { PCI_VDEVICE(MARVELL, 0x6040), chip_604x }, |
| 626 | { PCI_VDEVICE(MARVELL, 0x6041), chip_604x }, | 629 | { PCI_VDEVICE(MARVELL, 0x6041), chip_604x }, |