projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3a516b6)
ARM: fix duplicate symbols in multi_v5_defconfig
authorArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 13:35:44 +0000 (14:35 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 13:35:44 +0000 (14:35 +0100)
A couple of lines in multi_v5_defconfig appear twice,
causing a harmless Kconfig warning. This removes one
of the two copies.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/configs/multi_v5_defconfig patch | blob | blame | history

diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index 84ba24a0ead712a6b9cd7d8d16148b1a3b40e1f3..aa3dfb084fed6b3e4739f3a2d002daf616f18eb6 100644 (file)
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -111,10 +111,6 @@ CONFIG_SND_KIRKWOOD_SOC_T5325=y
 # CONFIG_ABX500_CORE is not set
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_SND_KIRKWOOD_SOC=y
 CONFIG_HID_DRAGONRISE=y
 CONFIG_HID_GYRATION=y
 CONFIG_HID_TWINHAN=y