Merge tag 'qcom-defconfig-for-5.5' of...

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.orgSigned-off-by: Olof Johansson <olof@lixom.net>

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