diff options
author | Mark Brown <broonie@kernel.org> | 2021-10-26 13:49:20 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-10-26 13:49:25 +0100 |
commit | 21b178b8e9cc41b24da5ae0eddde0397acefd3ef (patch) | |
tree | 61f947ccfc2a209d20bda877301ecf4735e2fce3 /drivers/soc/qcom/Kconfig | |
parent | ASoC: topology: Fix stub for snd_soc_tplg_component_remove() (diff) | |
parent | soc: qcom: apr: Add GPR support (diff) | |
download | linux-dev-21b178b8e9cc41b24da5ae0eddde0397acefd3ef.tar.xz linux-dev-21b178b8e9cc41b24da5ae0eddde0397acefd3ef.zip |
Merge tag '20210927135559.738-6-srinivas.kandagatla@linaro.org' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into v11_20211026_srinivas_kandagatla_asoc_qcom_add_audioreach_support for audioreach support
v5.15-rc1 + 20210927135559.738-[23456]-srinivas.kandagatla@linaro.org
This immutable branch is based on v5.15-rc1 and contains the following
patches extending the existig APR driver to also implement GPR:
20210927135559.738-2-srinivas.kandagatla@linaro.org
20210927135559.738-3-srinivas.kandagatla@linaro.org
20210927135559.738-4-srinivas.kandagatla@linaro.org
20210927135559.738-5-srinivas.kandagatla@linaro.org
20210927135559.738-6-srinivas.kandagatla@linaro.org
Diffstat (limited to 'drivers/soc/qcom/Kconfig')
-rw-r--r-- | drivers/soc/qcom/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 79b568f82a1c..bfa2ab5772cf 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -199,7 +199,7 @@ config QCOM_WCNSS_CTRL firmware to a newly booted WCNSS chip. config QCOM_APR - tristate "Qualcomm APR Bus (Asynchronous Packet Router)" + tristate "Qualcomm APR/GPR Bus (Asynchronous/Generic Packet Router)" depends on ARCH_QCOM || COMPILE_TEST depends on RPMSG depends on NET |