diff options
| author | Andy Gross <andy.gross@linaro.org> | 2016-11-23 20:01:54 +0300 |
|---|---|---|
| committer | Andy Gross <andy.gross@linaro.org> | 2016-11-23 20:01:54 +0300 |
| commit | e1ae0a7ee8849e12050933723e433a3d3ee26f7e (patch) | |
| tree | 9d7d1f3e52dc87e37b78f0d043f9aa8ba9423006 /include/linux | |
| parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
| parent | bd4760ca03156731674a570e44490986189d8228 (diff) | |
| download | linux-e1ae0a7ee8849e12050933723e433a3d3ee26f7e.tar.xz | |
Merge tag 'qcom-drivers-for-4.10' into drivers-for-4.10-2
Qualcomm ARM Based Driver Updates for v4.10
* Fixup QCOM SCM to use devm_reset_controller_register
* Add QCOM pinctrl to Qualcomm MAINTAINERS entry
* Add PM8994 regulator definitions
* Add stub for WCNSS_CTRL API
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/soc/qcom/wcnss_ctrl.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/soc/qcom/wcnss_ctrl.h b/include/linux/soc/qcom/wcnss_ctrl.h index a37bc5538f19..eab64976a73b 100644 --- a/include/linux/soc/qcom/wcnss_ctrl.h +++ b/include/linux/soc/qcom/wcnss_ctrl.h @@ -3,6 +3,19 @@ #include <linux/soc/qcom/smd.h> +#if IS_ENABLED(CONFIG_QCOM_WCNSS_CTRL) + struct qcom_smd_channel *qcom_wcnss_open_channel(void *wcnss, const char *name, qcom_smd_cb_t cb); +#else + +static inline struct qcom_smd_channel* +qcom_wcnss_open_channel(void *wcnss, const char *name, qcom_smd_cb_t cb) +{ + WARN_ON(1); + return ERR_PTR(-ENXIO); +} + +#endif + #endif |