diff options
| author | Olof Johansson <olof@lixom.net> | 2019-11-06 14:05:21 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-11-06 14:05:22 -0800 |
| commit | 536c43b41d1a05c262f47b97cb302d7ade97dae4 (patch) | |
| tree | 42e63180ce447eb294c5924417ff2bb91d7ff0ce | |
| parent | 1f0753ea6a38addd488ea62adac7fb0e81ac73ea (diff) | |
| parent | b2181be1cfb81da3fad0f8b6994b2e714ae66876 (diff) | |
Merge tag 'qcom-defconfig-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/defconfig
Qualcomm ARM Based defconfig Updates for v5.5
* Enable OCMEM support
* tag 'qcom-defconfig-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
ARM: qcom_defconfig: add ocmem support
Link: https://lore.kernel.org/r/1573068840-13098-3-git-send-email-agross@kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/qcom_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index 02f1e7b7c8f6..9792dd0aae0c 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -226,6 +226,7 @@ CONFIG_QCOM_WCNSS_PIL=y CONFIG_RPMSG_CHAR=y CONFIG_RPMSG_QCOM_SMD=y CONFIG_QCOM_GSBI=y +CONFIG_QCOM_OCMEM=y CONFIG_QCOM_PM=y CONFIG_QCOM_SMEM=y CONFIG_QCOM_SMD_RPM=y |