aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorArnd Bergmann2017-06-29 17:03:21 +0200
committerArnd Bergmann2017-06-29 17:03:21 +0200
commit9f4cfffb2d7d43e5cd541a0b6379d181c65d0f85 (patch)
tree4519071de6f98074c39a90f19f9ed6df768325ab /arch/arm
parenta4857add27d3e48b39e55269b616fe1b99ad3415 (diff)
parent7f794788dbf9e1a9ca9a5c1cc0a90642f3b4e4ce (diff)
Merge tag 'qcom-defconfig-for-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig
Pull "Qualcomm ARM Based defconfig Updates for v4.13 - Part 2" from Andy Gross: * Enable RPMSG_QCOM_SMD to get boards working again * tag 'qcom-defconfig-for-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: ARM: qcom_defconfig: enable RPMSG_QCOM_SMD
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/qcom_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
index 36b58d41c52d..b02039c712c3 100644
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -173,6 +173,7 @@ CONFIG_LEDS_GPIO=y
CONFIG_LEDS_PM8058=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_RPMSG_QCOM_SMD=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_PM8XXX=y
CONFIG_DMADEVICES=y