ASoC: jack: Fix multiple definition of `snd_soc_jack_add_gpiods'
authorJarkko Nikula <jarkko.nikula@linux.intel.com>
Tue, 27 May 2014 07:39:57 +0000 (10:39 +0300)
committerMark Brown <broonie@linaro.org>
Tue, 27 May 2014 11:05:30 +0000 (12:05 +0100)
commite667487b67d96fc2471529e3a5b404f51dc52b39
treeffb3f9207cab6de1632f14adf9cda914a6a2993f
parent83ad152d03b594b6a3fb9f3d313622b491cd6168
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>
include/sound/soc.h
This page took 0.024224 seconds and 5 git commands to generate.