summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/qcom_defconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-08-15 17:53:49 +0200
committerArnd Bergmann <arnd@arndb.de>2017-08-15 17:53:49 +0200
commit0c0f24c41e0b26d11eafc53b7f775ee48584adb2 (patch)
tree13498a7cb5baabe4c23391586eec7279307b2ab2 /arch/arm/configs/qcom_defconfig
parent4156effc624b1454e9d2075bf3a096707035ddec (diff)
parentc1bdf1b9a11416e183484df42616c0bab125204a (diff)
downloadlinux-0c0f24c41e0b26d11eafc53b7f775ee48584adb2.tar.bz2
Merge tag 'samsung-defconfig-arm-cleanups-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig
Pull "Bunch of ARM defconfig cleanups for v4.14" from Krzysztof Kozłowski: Cleanup ARMv7 defconfigs from options not existing anymore. * tag 'samsung-defconfig-arm-cleanups-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: qcom_defconfig: Cleanup from non-existing options ARM: ezx_defconfig: Cleanup from non-existing options ARM: vexpress_defconfig: Cleanup from non-existing options ARM: ixp4xx_defconfig: Cleanup from non-existing options ARM: multi_v7_defconfig: Cleanup from non-existing options
Diffstat (limited to 'arch/arm/configs/qcom_defconfig')
-rw-r--r--arch/arm/configs/qcom_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
index b02039c712c3..879159e4ab58 100644
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -199,7 +199,6 @@ CONFIG_QCOM_WCNSS_PIL=y
CONFIG_QCOM_GSBI=y
CONFIG_QCOM_PM=y
CONFIG_QCOM_SMEM=y
-CONFIG_QCOM_SMD=y
CONFIG_QCOM_SMD_RPM=y
CONFIG_QCOM_SMP2P=y
CONFIG_QCOM_SMSM=y