diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-01-29 11:13:46 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-30 07:44:35 -0500 |
commit | 7c47cd7ffd5e8fca28258e6e04207ad154d719e4 (patch) | |
tree | c181f2cf26aeb3c8ea523fc3798d46e483f15b87 | |
parent | c4b7586cc972ec8cca77d2f6faed1f19a11d6445 (diff) |
ASoC: pxa: make TTC DKB tristate
In a rare combination of Kconfig settings, the 88pm860x-codec
module may be selected as a loadable module, while it's also being
used by the ttb-dkb code that is built-in, resulting in a link
error:
sound/built-in.o: In function `ttc_pm860x_init':
:(.text+0x3e888): undefined reference to `pm860x_hs_jack_detect'
:(.text+0x3e898): undefined reference to `pm860x_mic_jack_detect'
Changing ttb-tkb to a tristate option tells Kconfig that 88pm86x
actually needs to be built-in if ttc-dkb is also built-in.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/pxa/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 2434b6d61675..39cea80846c3 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig | |||
@@ -140,7 +140,7 @@ config SND_PXA910_SOC | |||
140 | Marvell PXA910 reference platform. | 140 | Marvell PXA910 reference platform. |
141 | 141 | ||
142 | config SND_SOC_TTC_DKB | 142 | config SND_SOC_TTC_DKB |
143 | bool "SoC Audio support for TTC DKB" | 143 | tristate "SoC Audio support for TTC DKB" |
144 | depends on SND_PXA910_SOC && MACH_TTC_DKB && I2C=y | 144 | depends on SND_PXA910_SOC && MACH_TTC_DKB && I2C=y |
145 | select PXA_SSP | 145 | select PXA_SSP |
146 | select SND_PXA_SOC_SSP | 146 | select SND_PXA_SOC_SSP |