projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ba7f468)
arm64: remove duplicate PWM entry in defconfig
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Jul 2016 20:33:40 +0000 (22:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Jul 2016 20:33:40 +0000 (22:33 +0200)
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>
arch/arm64/configs/defconfig patch | blob | blame | history

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index ec402b499536242a147c6f39a656dc7d1c062a8d..d3aa857f2dac103da62dc27ad3847106e778d21a 100644 (file)
--- 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