diff options
author | Mark Brown <broonie@kernel.org> | 2018-04-05 16:49:48 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-04-05 16:49:48 +0100 |
commit | 2da9deac1e123ce8f9c22919f9f49b3a50d0c3fd (patch) | |
tree | 066bbeee7c6303afccd6b573c8f806ca149d6cb6 /drivers/ata/ahci.c | |
parent | c5833b96030f9e06cf7c19dd4f99d3b55985eb8c (diff) | |
parent | 8ff8cb8ec27effc5a0b04fee2c383b231a19f691 (diff) |
Merge tag 'v4.4.126' into linux-linaro-lsk-v4.4
This is the 4.4.126 stable release
Diffstat (limited to 'drivers/ata/ahci.c')
-rw-r--r-- | drivers/ata/ahci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 8ddf5d5c94fd..5a6a01135470 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -538,7 +538,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { .driver_data = board_ahci_yes_fbs }, { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230), .driver_data = board_ahci_yes_fbs }, - { PCI_DEVICE(PCI_VENDOR_ID_TTI, 0x0642), + { PCI_DEVICE(PCI_VENDOR_ID_TTI, 0x0642), /* highpoint rocketraid 642L */ + .driver_data = board_ahci_yes_fbs }, + { PCI_DEVICE(PCI_VENDOR_ID_TTI, 0x0645), /* highpoint rocketraid 644L */ .driver_data = board_ahci_yes_fbs }, /* Promise */ |