summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-17 14:35:44 +0100
committerArnd Bergmann <arnd@arndb.de>2014-03-17 14:35:44 +0100
commit30c04fdd032d1962dbe71eee8ad38dc5053194d0 (patch)
treecf44f59575c424e1eb42434b69fa08ea2bd53b81 /arch/arm/configs
parent3a516b6afbf90f4a577f9fea36eaf826b5101cb8 (diff)
downloadlinux-30c04fdd032d1962dbe71eee8ad38dc5053194d0.tar.bz2
ARM: fix duplicate symbols in multi_v5_defconfig
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>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/multi_v5_defconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index 84ba24a0ead7..aa3dfb084fed 100644
--- 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