diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-13 04:50:48 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-14 12:20:54 +0200 |
| commit | 4835ff9aca639107ca0233c10aa854d460c8797d (patch) | |
| tree | a2dd84a6f66eb8c9261dbd79a9951988daad7aa0 /sound/soc/soc-io.c | |
| parent | Merge branch 'for-3.1' into for-3.2 (diff) | |
| download | linux-4835ff9aca639107ca0233c10aa854d460c8797d.tar.xz linux-4835ff9aca639107ca0233c10aa854d460c8797d.zip | |
ASoC: Support !CONFIG_REGMAP builds
Since we changed regmap to be selected and register per bus rather than
via the core only we can't rely on it being enabled by the ASoC core.
Support compiling it out.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Reported-by: Axel Lin <axel.lin@gmail.com>
Diffstat (limited to 'sound/soc/soc-io.c')
| -rw-r--r-- | sound/soc/soc-io.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c index 22b64317182b..66fcccd79efe 100644 --- a/sound/soc/soc-io.c +++ b/sound/soc/soc-io.c @@ -18,6 +18,7 @@ #include <trace/events/asoc.h> +#ifdef CONFIG_REGMAP static int hw_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value) { @@ -150,4 +151,12 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, return 0; } EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io); - +#else +int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, + int addr_bits, int data_bits, + enum snd_soc_control_type control) +{ + return -ENOTSUPP; +} +EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io); +#endif |