summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-07-05 17:54:24 +0100
committerMark Brown <broonie@linaro.org>2014-07-05 18:00:34 +0100
commit1bb60b3a5ae526287fc6d0c55391f5664cc1e672 (patch)
tree97cfd3d9438846741cbcfa5a6a6ff2a9f130fb5a
parent13447cdc76a8c0a57c9b3395d896b01feb82f34b (diff)
downloadlinux-1bb60b3a5ae526287fc6d0c55391f5664cc1e672.tar.bz2
ASoC: s6105-ipcam: Fix build for I2C dependencies
The s6105-ipcam driver calls i2c_register_board_info() which means that not only does it need I2C to be enabled to be built but since that symbol is not exported it means that the driver also can't be linked as a module. Use a bool instead of a tristate and add a dependency on I2C to fix these issues. Commit b5dd60fd263 (ASoC: s6000: Allow to build when COMPILE_TEST is enabled) made this problem more visible since it enabled build of the driver on more common architectures but this has always been an issue. Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/s6000/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/s6000/Kconfig b/sound/soc/s6000/Kconfig
index 4823e1e4daef..f244a2566f20 100644
--- a/sound/soc/s6000/Kconfig
+++ b/sound/soc/s6000/Kconfig
@@ -15,8 +15,9 @@ config SND_S6000_SOC_I2S
tristate
config SND_S6000_SOC_S6IPCAM
- tristate "SoC Audio support for Stretch 6105 IP Camera"
- depends on SND_S6000_SOC
+ bool "SoC Audio support for Stretch 6105 IP Camera"
+ depends on SND_S6000_SOC=y
+ depends on I2C=y
depends on XTENSA_PLATFORM_S6105 || COMPILE_TEST
select SND_S6000_SOC_I2S
select SND_SOC_TLV320AIC3X