summaryrefslogtreecommitdiffstats
path: root/drivers/ata/ahci_platform.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-13 15:52:12 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-13 15:52:12 -0700
commitca17749259d26f7ddbb0678790d5d534018d0a6b (patch)
tree730e0bd336e78d673760df2b4116277af1c8c495 /drivers/ata/ahci_platform.c
parent07584d4a356ef52c084e1e4fedc22858ffc2f8b2 (diff)
parent1795cd9b3a91d4b5473c97f491d63892442212ab (diff)
downloadtalos-op-linux-ca17749259d26f7ddbb0678790d5d534018d0a6b.tar.gz
talos-op-linux-ca17749259d26f7ddbb0678790d5d534018d0a6b.zip
Merge 3.16-rc5 into tty-next.
We want those fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ata/ahci_platform.c')
-rw-r--r--drivers/ata/ahci_platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index ebe505c17763..b10d81ddb528 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -58,7 +58,7 @@ static int ahci_probe(struct platform_device *pdev)
}
if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
- hflags |= AHCI_HFLAG_NO_FBS;
+ hflags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;
rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info,
hflags, 0, 0);
OpenPOWER on IntegriCloud