aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-03 10:35:46 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-03 10:39:58 -0400
commit61e49bf1941050e85035e139c6f9eace60c72e70 (patch)
tree6edececfac0222d5b0c164b81af0154d3e91372c
parent9b5999b1bc74aea2a515701f937d7ad3e17f10e4 (diff)
ASoC: samsung: WM8994 depends on MFD_WM8994
Any driver that selects SND_SOC_WM8994 should also make sure that MFD_WM8994 is set, since the codec relies on the mfd code: sound/built-in.o: In function `wm8994_read': last.c:(.text+0x20160): undefined reference to `wm8994_reg_read' sound/built-in.o: In function `wm8994_write': last.c:(.text+0x20e68): undefined reference to `wm8994_reg_write' This solves the problem by selecting the MFD driver directly and adding extra 'depends on' statements to make sure that we respect the dependencies of that driver. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/samsung/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index dd3b3eac0805..53aaa69eda03 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -64,6 +64,8 @@ config SND_SOC_SAMSUNG_SMDK_WM8580
64config SND_SOC_SAMSUNG_SMDK_WM8994 64config SND_SOC_SAMSUNG_SMDK_WM8994
65 tristate "SoC I2S Audio support for WM8994 on SMDK" 65 tristate "SoC I2S Audio support for WM8994 on SMDK"
66 depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210 || MACH_SMDK4212) 66 depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210 || MACH_SMDK4212)
67 depends on I2C=y && GENERIC_HARDIRQS
68 select MFD_WM8994
67 select SND_SOC_WM8994 69 select SND_SOC_WM8994
68 select SND_SAMSUNG_I2S 70 select SND_SAMSUNG_I2S
69 help 71 help
@@ -150,7 +152,9 @@ config SND_SOC_SMARTQ
150config SND_SOC_GONI_AQUILA_WM8994 152config SND_SOC_GONI_AQUILA_WM8994
151 tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" 153 tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"
152 depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA) 154 depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA)
155 depends on I2C=y && GENERIC_HARDIRQS
153 select SND_SAMSUNG_I2S 156 select SND_SAMSUNG_I2S
157 select MFD_WM8994
154 select SND_SOC_WM8994 158 select SND_SOC_WM8994
155 help 159 help
156 Say Y if you want to add support for SoC audio on goni or aquila 160 Say Y if you want to add support for SoC audio on goni or aquila
@@ -174,6 +178,8 @@ config SND_SOC_SMDK_WM8580_PCM
174config SND_SOC_SMDK_WM8994_PCM 178config SND_SOC_SMDK_WM8994_PCM
175 tristate "SoC PCM Audio support for WM8994 on SMDK" 179 tristate "SoC PCM Audio support for WM8994 on SMDK"
176 depends on SND_SOC_SAMSUNG && (MACH_SMDKC210 || MACH_SMDKV310 || MACH_SMDK4212) 180 depends on SND_SOC_SAMSUNG && (MACH_SMDKC210 || MACH_SMDKV310 || MACH_SMDK4212)
181 depends on I2C=y && GENERIC_HARDIRQS
182 select MFD_WM8994
177 select SND_SOC_WM8994 183 select SND_SOC_WM8994
178 select SND_SAMSUNG_PCM 184 select SND_SAMSUNG_PCM
179 help 185 help