diff options
| author |   Kalle Valo <kvalo@codeaurora.org> | 2017-01-31 09:50:50 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-01-31 09:50:50 +0200 |
| commit | 7243a1af37a4dc9225004546d9d0756c529ad3ce (patch) | |
| tree | 6d53c420177404565abf245810809b76415d9bd6 /include/linux | |
| parent | bcma: make OF code more generic (not platform_device specific) (diff) | |
| parent | ath10k: Search SMBIOS for OEM board file extension (diff) | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 4.11. Major changes:
wcn36xx
* convert to a proper QCOM_SMD driver (from the platform_driver interface)
ath10k
* VHT160 support
* dump Copy Engine registers during firmware crash
* search board file extension from SMBIOS
wil6210
* add disable_ap_sme module parameter
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/soc/qcom/smem_state.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/soc/qcom/smem_state.h b/include/linux/soc/qcom/smem_state.h index 7b88697929e9..b8478ee7a71f 100644 --- a/include/linux/soc/qcom/smem_state.h +++ b/include/linux/soc/qcom/smem_state.h @@ -1,7 +1,7 @@ #ifndef __QCOM_SMEM_STATE__ #define __QCOM_SMEM_STATE__ -#include <linux/errno.h> +#include <linux/err.h> struct device_node; struct qcom_smem_state; |