summaryrefslogtreecommitdiff
path: root/drivers/ata/ahci.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-12-03 16:39:51 +0400
committerTejun Heo <tj@kernel.org>2013-12-03 16:39:51 +0400
commitc869325a45ce3369d456d7632409b675c3adb7ce (patch)
tree4d71e7eee6dfbf94770fd5be829a241b2f83dc62 /drivers/ata/ahci.c
parent80361fa02e59cbc4ddfd4ceae18441092797149f (diff)
parent10becdb402af4fd4808a0491a726b96128c41076 (diff)
downloadlinux-c869325a45ce3369d456d7632409b675c3adb7ce.tar.xz
libata: Merge branch 'for-3.13-fixes' into for-3.14
Pulling in for-3.13-fixes for the ahci_imx fix as further changes depend on it. Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/ahci.c')
-rw-r--r--drivers/ata/ahci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index c55e00562527..ef8642e12a76 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -437,6 +437,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
.driver_data = board_ahci_yes_fbs }, /* 88se9172 on some Gigabyte */
{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3),
.driver_data = board_ahci_yes_fbs },
+ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230),
+ .driver_data = board_ahci_yes_fbs },
/* Promise */
{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */