Commit 7c47cd7f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c4b7586c
...@@ -140,7 +140,7 @@ config SND_PXA910_SOC ...@@ -140,7 +140,7 @@ config SND_PXA910_SOC
Marvell PXA910 reference platform. Marvell PXA910 reference platform.
config SND_SOC_TTC_DKB config SND_SOC_TTC_DKB
bool "SoC Audio support for TTC DKB" tristate "SoC Audio support for TTC DKB"
depends on SND_PXA910_SOC && MACH_TTC_DKB && I2C=y depends on SND_PXA910_SOC && MACH_TTC_DKB && I2C=y
select PXA_SSP select PXA_SSP
select SND_PXA_SOC_SSP select SND_PXA_SOC_SSP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment