diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 09:35:44 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 09:35:44 -0400 |
commit | 30c04fdd032d1962dbe71eee8ad38dc5053194d0 (patch) | |
tree | cf44f59575c424e1eb42434b69fa08ea2bd53b81 | |
parent | 3a516b6afbf90f4a577f9fea36eaf826b5101cb8 (diff) |
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>
-rw-r--r-- | arch/arm/configs/multi_v5_defconfig | 4 |
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 | |||
111 | # CONFIG_ABX500_CORE is not set | 111 | # CONFIG_ABX500_CORE is not set |
112 | CONFIG_REGULATOR=y | 112 | CONFIG_REGULATOR=y |
113 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 113 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
114 | CONFIG_SOUND=y | ||
115 | CONFIG_SND=y | ||
116 | CONFIG_SND_SOC=y | ||
117 | CONFIG_SND_KIRKWOOD_SOC=y | ||
118 | CONFIG_HID_DRAGONRISE=y | 114 | CONFIG_HID_DRAGONRISE=y |
119 | CONFIG_HID_GYRATION=y | 115 | CONFIG_HID_GYRATION=y |
120 | CONFIG_HID_TWINHAN=y | 116 | CONFIG_HID_TWINHAN=y |