| Message ID | 1401176397-17591-1-git-send-email-jarkko.nikula@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e667487b67d96fc2471529e3a5b404f51dc52b39 |
| Headers | show |
On Tue, May 27, 2014 at 10:39:57AM +0300, Jarkko Nikula wrote: > Commit f025d3b9c64e ("ASoC: jack: Add support for GPIO descriptor defined > jack pins") caused build error when CONFIG_GPIOLIB is not set: Applied, thanks.
diff --git a/include/sound/soc.h b/include/sound/soc.h index 98dca42487bc..15ee2f71b92e 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -464,9 +464,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; }
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> --- include/sound/soc.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)