diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-30 12:04:14 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-30 12:04:14 +0200 |
| commit | c79c33af8f867e57ad4b84102db7901aee67485a (patch) | |
| tree | aa619736b89a143cfc48f9647493c929523a928a /include/sound | |
| parent | ALSA: hda - Simplify CONFIG_SND_HDA_I915 condition (diff) | |
| parent | ASoC: Pass card instead of dapm context to snd_soc_dapm_new_widgets() (diff) | |
| download | linux-c79c33af8f867e57ad4b84102db7901aee67485a.tar.xz linux-c79c33af8f867e57ad4b84102db7901aee67485a.zip | |
Merge remote-tracking branch 'asoc/topic/core' into tmp
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dapm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index c728d28ae9a5..27a72d5d4b00 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -413,7 +413,7 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card, struct snd_soc_dapm_widget *sink); /* dapm path setup */ -int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm); +int snd_soc_dapm_new_widgets(struct snd_soc_card *card); void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm); int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_route *route, int num); |