Jarkko Nikula e667487b67 ASoC: jack: Fix multiple definition of `snd_soc_jack_add_gpiods' ...

Commit f025d3b9c6 ("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>

2014-05-27 12:05:30 +01:00

..

ac97_codec.h

Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2012-10-09 07:07:14 +09:00

aci.h

…

ad1816a.h

Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2012-10-09 07:07:14 +09:00

ad1843.h

…

adau1373.h

…

aess.h

ASoC: TI AESS: add autogating-enable function, callable from architecture code

2013-02-10 11:22:23 -07:00

ak4xxx-adda.h

…

ak4113.h

…

ak4114.h

ALSA: ak4114: Fix wrong register array size

2013-10-29 16:42:36 +01:00

ak4117.h

…

ak4531_codec.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

ak4641.h

…

alc5623.h

…

asequencer.h

UAPI: (Scripted) Disintegrate include/sound

2012-10-09 09:49:13 +01:00

asound.h

UAPI: (Scripted) Disintegrate include/sound

2012-10-09 09:49:13 +01:00

asoundef.h

ALSA: Add definitions for CEA-861 Audio InfoFrames

2012-04-18 08:00:36 +02:00

atmel-abdac.h

…

atmel-ac97c.h

…

compress_driver.h

ALSA: compress: fix drain calls blocking other compress functions (v6)

2013-11-07 10:12:27 +01:00

control.h

ALSA: vmaster: Add snd_ctl_sync_vmaster() helper function

2013-06-24 15:51:54 +02:00

core.h

ALSA: core - Define snd_pci_quirk without CONFIG_PCI

2014-03-01 11:23:41 +01:00

cs42l52.h

ASoC: cs42l52: Make MICA/B mixer dependent on mic config

2013-11-28 10:20:51 +00:00

cs42l73.h

ASoC: cs42l73: Add platform data support for cs42l73 codec

2013-10-18 00:37:29 +01:00

cs4231-regs.h

…

cs4271.h

ALSA: ASoC: cs4271: add optional soft reset workaround

2012-12-24 15:53:28 +00:00

cs8403.h

…

cs8427.h

ALSA: cs8427: separate HW initialization

2014-04-03 14:59:48 +02:00

da7213.h

ASoC: codecs: Add da7213 codec

2013-02-14 17:27:17 +00:00

da9055.h

ASoC: codecs: Add DA9055 codec driver

2012-09-28 14:21:54 +01:00

designware_i2s.h

ASoC: Add support for synopsys i2s controller as per ASoC framework.

2012-06-22 10:25:45 +01:00

dmaengine_pcm.h

ASoC: dmaengine: add custom DMA config to snd_dmaengine_pcm_config

2013-12-09 18:45:01 +00:00

emu10k1_synth.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

emu10k1.h

Revert "ALSA: emu10k1: Fix warning: "CCR" redefined"

2014-03-11 07:54:14 +01:00

emu8000_reg.h

…

emu8000.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

emux_legacy.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

emux_synth.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

es1688.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

gus.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

hda_hwdep.h

…

hda_verbs.h

ALSA: hda - Split verb definitions into sound/hda_verbs.h

2013-12-09 17:31:40 +01:00

hwdep.h

ALSA: hwdep: Allow to assign the given parent

2014-02-25 12:12:50 +01:00

i2c.h

…

info.h

switch procfs to umode_t use

2012-01-03 22:54:56 -05:00

initval.h

ALSA: isa: Move snd_legacy_find_free_ioport to initval.h

2012-08-03 12:57:44 +02:00

jack.h

ALSA: Use a define for the number of jack switch types

2012-02-27 17:34:44 +01:00

l3.h

…

max9768.h

ASoC: max9768: add driver for max9768 amplifier

2012-01-30 21:50:55 +00:00

max98088.h

…

max98090.h

ASoC:: max98090: Remove executable bit

2013-03-20 10:54:12 +01:00

max98095.h

ASoC: max98095: Single bit bitfields should be unsigned

2012-05-13 23:33:53 +01:00

memalloc.h

ALSA: Remove memory reservation code from memalloc helper

2014-01-09 07:32:10 +01:00

minors.h

ALSA: core: add support for compressed devices

2011-12-23 10:07:46 +01:00

mixer_oss.h

…

mpu401.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

opl3.h

…

opl4.h

…

pcm_oss.h

…

pcm_params.h

ALSA: Add params_width() helpers

2013-12-30 12:19:26 +00:00

pcm-indirect.h

…

pcm.h

ALSA: pcm: Use standard printk helpers

2014-02-14 08:14:15 +01:00

pt2258.h

…

pxa2xx-lib.h

ASoC: pxa: use snd_dmaengine_dai_dma_data

2013-08-15 11:29:07 +01:00

rawmidi.h

ALSA: rawmidi: remove undefined functions.

2014-02-21 12:06:12 +01:00

rcar_snd.h

ASoC: rsnd: rename scu to src

2014-03-05 14:07:53 +08:00

rt5640.h

ASoC: add RT5640 CODEC driver

2013-06-12 17:46:54 +01:00

s3c24xx_uda134x.h

…

sb16_csp.h

UAPI: (Scripted) Disintegrate include/sound

2012-10-09 09:49:13 +01:00

sb.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

seq_device.h

…

seq_kernel.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

seq_midi_emul.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

seq_midi_event.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

seq_oss_legacy.h

…

seq_oss.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

seq_virmidi.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

sh_dac_audio.h

…

sh_fsi.h

ASoC: fsi: cleanup sh_fsi.h

2012-12-24 15:57:20 +00:00

simple_card.h

ASoC: simple-card: add slot information parsing supports

2014-02-23 14:26:37 +09:00

snd_wavefront.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

soc-dai.h

ASoC: core: remove the 'of_' prefix of of_xlate_tdm_slot_mask.

2014-03-25 13:06:43 +00:00

soc-dapm.h

Merge remote-tracking branch 'asoc/topic/enum' into asoc-next

2014-03-12 23:03:59 +00:00

soc-dpcm.h

ASoC: DPCM: make some DPCM API calls non static for compressed usage

2014-01-17 17:56:21 +00:00

soc.h

ASoC: jack: Fix multiple definition of `snd_soc_jack_add_gpiods'

2014-05-27 12:05:30 +01:00

soundfont.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

spear_dma.h

ASoC: SPEAr: remove custom DMA alloc compat function

2013-12-18 18:55:06 +00:00

spear_spdif.h

ASoC: SPEAr spdif_in: Add spdif IN support

2012-06-23 11:58:10 +01:00

sta32x.h

ASoC: sta32x: add workaround for ESD reset issue

2011-11-14 21:36:43 +00:00

tas5086.h

ALSA: ASoC: add codec driver for TI TAS5086

2013-03-08 21:06:09 +08:00

tea6330t.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00

timer.h

…

tlv320aic3x.h

ASoC: tlv320aic3x: Convert mic bias to a supply widget

2013-02-04 18:35:19 +00:00

tlv320aic32x4.h

ASoC: tlv320aic32x4: Add rstn gpio to platform data.

2012-11-01 14:35:56 +00:00

tlv320dac33-plat.h

…

tlv.h

ALSA: Add comment for control TLV API

2013-05-08 15:43:56 +02:00

tpa6130a2-plat.h

…

uda134x.h

…

uda1380.h

…

util_mem.h

…

vx_core.h

ALSA: vx: hard dependency on the standard fw loader

2012-11-22 17:48:01 +01:00

wavefront.h

…

wm0010.h

ASoC: wm0010: Add initial wm0010 DSP driver

2012-08-23 16:12:12 +01:00

wm1250-ev1.h

…

wm2000.h

ASoC: wm2000: Use clock API integration to configure MCLK divisor

2012-12-24 15:42:35 +00:00

wm2200.h

ASoC: wm2200: Provide platform data for MICBIAS configuration

2013-02-05 15:53:07 +00:00

wm5100.h

…

wm8903.h

ASoC: WM8903: Fix platform data gpio_cfg confusion

2011-12-06 10:29:22 +00:00

wm8904.h

…

wm8955.h

…

wm8960.h

ASoC: wm8960: remove 'dres' field from platform data structure

2012-09-21 08:35:06 -04:00

wm8962.h

ASoC: wm8962: Optimise power consumption for IN4 DC measurement usage

2012-01-24 21:19:45 +00:00

wm8993.h

ASoC: wm_hubs: Allow configuration of MICBIAS power up delay via pdata

2012-08-22 19:00:37 +01:00

wm8996.h

…

wm9081.h

…

wm9090.h

…

wss.h

UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers

2012-10-02 18:01:25 +01:00