diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-30 06:04:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-30 06:04:14 -0400 |
| commit | c79c33af8f867e57ad4b84102db7901aee67485a (patch) | |
| tree | aa619736b89a143cfc48f9647493c929523a928a /include/sound | |
| parent | 1c9a341bbdc14051a4d8c74ea67269786c7d3736 (diff) | |
| parent | 824ef826f3c4d83d1925a5e351313bfd3e5ca6cb (diff) | |
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, | |||
| 413 | struct snd_soc_dapm_widget *sink); | 413 | struct snd_soc_dapm_widget *sink); |
| 414 | 414 | ||
| 415 | /* dapm path setup */ | 415 | /* dapm path setup */ |
| 416 | int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm); | 416 | int snd_soc_dapm_new_widgets(struct snd_soc_card *card); |
| 417 | void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm); | 417 | void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm); |
| 418 | int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, | 418 | int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, |
| 419 | const struct snd_soc_dapm_route *route, int num); | 419 | const struct snd_soc_dapm_route *route, int num); |