diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-10-12 09:43:08 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-12 12:09:15 -0400 |
commit | b29a33a211a855e8e52c095af13e1d99ed60d07c (patch) | |
tree | 49927fca36e4c41956276d973683ce960cc41834 /sound/soc/pxa/Kconfig | |
parent | 0f8ea586d7a9cfd6567b0cdfd73c5dfc2e8b9da8 (diff) |
ASoC: Make SND_SOC_SAARB and SND_SOC_TAVOREVB3 select MFD_88PM860X
In saarb_pm860x_init() and evb3_pm860x_init(), we call
pm860x_hs_jack_detect() and pm860x_mic_jack_detect() which in turn
calls pm860x_set_bits().
Thus make SND_SOC_SAARB and SND_SOC_TAVOREVB3 select MFD_88PM860X.
This patch fixes below build error if CONFIG_MFD_88PM860X is not configured.
LD .tmp_vmlinux1
sound/built-in.o: In function `pm860x_write_reg_cache':
last.c:(.text+0x29e9c): undefined reference to `pm860x_reg_write'
sound/built-in.o: In function `pm860x_set_bias_level':
last.c:(.text+0x29ecc): undefined reference to `pm860x_set_bits'
last.c:(.text+0x29f00): undefined reference to `pm860x_reg_write'
last.c:(.text+0x29f18): undefined reference to `pm860x_reg_write'
sound/built-in.o: In function `pm860x_read_reg_cache':
last.c:(.text+0x29f40): undefined reference to `pm860x_reg_read'
sound/built-in.o: In function `pm860x_probe':
last.c:(.text+0x2a034): undefined reference to `pm860x_bulk_read'
sound/built-in.o: In function `pm860x_codec_handler':
last.c:(.text+0x2a344): undefined reference to `pm860x_reg_read'
last.c:(.text+0x2a354): undefined reference to `pm860x_reg_read'
sound/built-in.o: In function `pm860x_mic_jack_detect':
last.c:(.text+0x2a450): undefined reference to `pm860x_set_bits'
sound/built-in.o: In function `pm860x_hs_jack_detect':
last.c:(.text+0x2a4d0): undefined reference to `pm860x_set_bits'
last.c:(.text+0x2a4f8): undefined reference to `pm860x_set_bits'
last.c:(.text+0x2a510): undefined reference to `pm860x_set_bits'
make: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/pxa/Kconfig')
-rw-r--r-- | sound/soc/pxa/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 33ebc46b45b5..ffd2242e305f 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig | |||
@@ -121,6 +121,7 @@ config SND_PXA2XX_SOC_PALM27X | |||
121 | config SND_SOC_SAARB | 121 | config SND_SOC_SAARB |
122 | tristate "SoC Audio support for Marvell Saarb" | 122 | tristate "SoC Audio support for Marvell Saarb" |
123 | depends on SND_PXA2XX_SOC && MACH_SAARB | 123 | depends on SND_PXA2XX_SOC && MACH_SAARB |
124 | select MFD_88PM860X | ||
124 | select SND_PXA_SOC_SSP | 125 | select SND_PXA_SOC_SSP |
125 | select SND_SOC_88PM860X | 126 | select SND_SOC_88PM860X |
126 | help | 127 | help |
@@ -130,6 +131,7 @@ config SND_SOC_SAARB | |||
130 | config SND_SOC_TAVOREVB3 | 131 | config SND_SOC_TAVOREVB3 |
131 | tristate "SoC Audio support for Marvell Tavor EVB3" | 132 | tristate "SoC Audio support for Marvell Tavor EVB3" |
132 | depends on SND_PXA2XX_SOC && MACH_TAVOREVB3 | 133 | depends on SND_PXA2XX_SOC && MACH_TAVOREVB3 |
134 | select MFD_88PM860X | ||
133 | select SND_PXA_SOC_SSP | 135 | select SND_PXA_SOC_SSP |
134 | select SND_SOC_88PM860X | 136 | select SND_SOC_88PM860X |
135 | help | 137 | help |