From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 17 Mar 2014 13:35:44 +0000 (+0100)
Subject: ARM: fix duplicate symbols in multi_v5_defconfig
X-Git-Tag: boards-3.15~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30c04fdd032d1962dbe71eee8ad38dc5053194d0;p=karo-tx-linux.git

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>
---

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