diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:04 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:04 +0000 |
| commit | b47f8a5dfb4fcc906d93c42a22f050d69df96ea6 (patch) | |
| tree | 4cca1bae26ab7fc6df207c14909f6d98f4e5dd0e /include/sound/soc-dapm.h | |
| parent | d01aa9b704afa8875c2ae919cfd639660b2a26bc (diff) | |
| parent | fcf6c5ea7abd42cfc2dde0ff0451b209951de9b4 (diff) | |
| download | linux-b47f8a5dfb4fcc906d93c42a22f050d69df96ea6.tar.gz linux-b47f8a5dfb4fcc906d93c42a22f050d69df96ea6.tar.bz2 linux-b47f8a5dfb4fcc906d93c42a22f050d69df96ea6.zip | |
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 e8e0220404d4..a2a0cf6e74fd 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 */ |