diff options
| author | Mark Brown <broonie@kernel.org> | 2016-07-25 00:07:22 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-25 00:07:22 +0300 |
| commit | 0d911262808d07af538c23b1b6d249b3a4a9a431 (patch) | |
| tree | 8fcba6f2d3ca81438c84f3deb85888b5796521f4 | |
| parent | 9b876c99d33eb5ac4148d9c3ef5042955dac57c3 (diff) | |
| parent | a5d5639f812f24f10c7affaf0d537c204fdea986 (diff) | |
| download | linux-0d911262808d07af538c23b1b6d249b3a4a9a431.tar.xz | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
| -rw-r--r-- | include/sound/soc-dapm.h | 3 | ||||
| -rw-r--r-- | sound/soc/soc-dapm.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 3101d53468aa..0efeb38ae059 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -382,6 +382,9 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol, int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_widget *widget, int num); +struct snd_soc_dapm_widget *snd_soc_dapm_new_control( + struct snd_soc_dapm_context *dapm, + const struct snd_soc_dapm_widget *widget); int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, struct snd_soc_dai *dai); int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card); diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index c4464858bf01..cc8f480251e7 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3282,6 +3282,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, mutex_unlock(&dapm->card->dapm_mutex); return w; } +EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control); struct snd_soc_dapm_widget * snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, |