diff options
| author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2014-05-27 11:39:57 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-27 15:05:30 +0400 |
| commit | e667487b67d96fc2471529e3a5b404f51dc52b39 (patch) | |
| tree | ffb3f9207cab6de1632f14adf9cda914a6a2993f /include/sound | |
| parent | 83ad152d03b594b6a3fb9f3d313622b491cd6168 (diff) | |
| download | linux-e667487b67d96fc2471529e3a5b404f51dc52b39.tar.xz | |
ASoC: jack: Fix multiple definition of `snd_soc_jack_add_gpiods'
Commit f025d3b9c64e ("ASoC: jack: Add support for GPIO descriptor defined
jack pins") caused build error when CONFIG_GPIOLIB is not set:
sound/include/sound/soc.h:470: multiple definition of `snd_soc_jack_add_gpiods'
sound/soc/soc-core.o:sound/include/sound/soc.h:470: first defined here
make[2]: *** [sound/soc/snd-soc-core.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2
Fix this by marking snd_soc_jack_add_gpiods() as static inline in soc.h.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index a2408a5b96a7..ac21cc22c4e9 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -465,9 +465,10 @@ static inline int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, return 0; } -int snd_soc_jack_add_gpiods(struct device *gpiod_dev, - struct snd_soc_jack *jack, - int count, struct snd_soc_jack_gpio *gpios) +static inline int snd_soc_jack_add_gpiods(struct device *gpiod_dev, + struct snd_soc_jack *jack, + int count, + struct snd_soc_jack_gpio *gpios) { return 0; } |