diff options
| author | Tejun Heo <tj@kernel.org> | 2014-07-30 16:49:04 (GMT) |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-07-30 16:49:04 (GMT) |
| commit | e8f781836dc3335b5533f6e177a105bbe3ee7345 (patch) | |
| tree | b6f05b7bf6e69bcc436ab894b7dc84c28c746d1a /drivers/ata/ahci.c | |
| parent | 19f5be0f40922717e2b6e39a9822e7e7f30fd81f (diff) | |
| parent | 1a112d10f03e83fb3a2fdc4c9165865dec8a3ca6 (diff) | |
| download | linux-e8f781836dc3335b5533f6e177a105bbe3ee7345.tar.xz | |
Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata into for-3.17
The scheduled ahci platform patches depend on change in
for-3.16-fixes. Pull it into for-3.17.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/ahci.c')
| -rw-r--r-- | drivers/ata/ahci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index dae5607..4cd52a4 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -456,6 +456,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { /* Promise */ { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */ + { PCI_VDEVICE(PROMISE, 0x3781), board_ahci }, /* FastTrak TX8660 ahci-mode */ /* Asmedia */ { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci }, /* ASM1060 */ |