diff options
| author | Mark Brown <[email protected]> | 2014-12-24 12:56:40 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2014-12-24 12:56:40 +0000 |
| commit | cf82602c41cb3076b0d2efe92d9b080542897861 (patch) | |
| tree | 99967d02aa47726a162387f2780f818a168f7b20 /include | |
| parent | f2ec1d3b25776051a9205289dab12e9401d33f8a (diff) | |
| parent | 86d7500326ea71ea72aeaf0da78671eef28be2af (diff) | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'include')
| -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 89823cfe6f04..ecffeccb5534 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -431,7 +431,6 @@ int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin); int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, const char *pin); -void snd_soc_dapm_auto_nc_pins(struct snd_soc_card *card); unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol); /* Mostly internal - should not normally be used */ |