diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-12 14:48:31 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-12 14:48:31 -0400 |
| commit | 77b62fa5d23988155132cf7fee44f2c209e3dc4c (patch) | |
| tree | 41cafd1b209f115a3c97939e1a566c69d4c58a01 /include/sound/soc-dapm.h | |
| parent | d1113af4e8c0f2cd71e52cb904447bd0eec8aa54 (diff) | |
| parent | 6b5b042d4c675cb9d3446a1cdcaca98e715ba812 (diff) | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'include/sound/soc-dapm.h')
| -rw-r--r-- | include/sound/soc-dapm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 485fc9d1a7bc..d3a76b55186c 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
| @@ -440,7 +440,6 @@ void dapm_mark_endpoints_dirty(struct snd_soc_card *card); | |||
| 440 | int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream, | 440 | int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream, |
| 441 | struct snd_soc_dapm_widget_list **list); | 441 | struct snd_soc_dapm_widget_list **list); |
| 442 | 442 | ||
| 443 | struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(struct snd_kcontrol *kcontrol); | ||
| 444 | struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm( | 443 | struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm( |
| 445 | struct snd_kcontrol *kcontrol); | 444 | struct snd_kcontrol *kcontrol); |
| 446 | 445 | ||