diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2016-09-09 15:19:40 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2016-09-09 15:19:40 +0300 |
| commit | 3cd32dde17ea938651b434fc35dee8370f555378 (patch) | |
| tree | f55e2a98eb716ba1976aeb21d02ffbea3711fd26 /drivers/net/wireless/ath/ath10k/pci.c | |
| parent | 78a9e170388b672f609cb6e8e097e0ddca24e6f5 (diff) | |
| parent | e34f2ff40e0339f6a379e1ecf49e8f2759056453 (diff) | |
| download | linux-3cd32dde17ea938651b434fc35dee8370f555378.tar.xz | |
Merge branch 'ath-current' into ath-next
Commit 3c97f5de1f28 ("ath10k: implement NAPI support") conflicts with
ath-current. To avoid any merge problems merge ath-current to ath-next already now.
Conflicts:
drivers/net/wireless/ath/ath10k/htt_rx.c
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/pci.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 930e9511a917..0635995ba165 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -3181,7 +3181,6 @@ static int ath10k_pci_probe(struct pci_dev *pdev, pci_hard_reset = ath10k_pci_qca988x_chip_reset; break; case QCA9887_1_0_DEVICE_ID: - dev_warn(&pdev->dev, "QCA9887 support is still experimental, there are likely bugs. You have been warned.\n"); hw_rev = ATH10K_HW_QCA9887; pci_ps = false; pci_soft_reset = ath10k_pci_warm_reset; |