aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-15 22:33:40 +0200
committerArnd Bergmann <arnd@arndb.de>2016-07-15 22:33:40 +0200
commit7e03e116e7603fa30e150df889e8daccd429facf (patch)
tree0c0af77df8b2384ea081539eba8955aae72f3edc /arch
parentMerge tag 'tegra-for-4.8-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/arm64 (diff)
downloadlinux-dev-7e03e116e7603fa30e150df889e8daccd429facf.tar.xz
linux-dev-7e03e116e7603fa30e150df889e8daccd429facf.zip
arm64: remove duplicate PWM entry in defconfig
We merged two patches that both enabled CONFIG_PWM, leading to a harmless warning: arch/arm64/configs/defconfig:352:warning: override: reassigning to symbol PWM This removes one of the two identical lines to avoid the warning. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/configs/defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index ec402b499536..d3aa857f2dac 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -346,7 +346,6 @@ CONFIG_ARM_SCPI_PROTOCOL=y
CONFIG_ACPI=y
CONFIG_IIO=y
CONFIG_EXYNOS_ADC=y
-CONFIG_PWM=y
CONFIG_PWM_SAMSUNG=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y