diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-30 16:22:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-30 16:22:11 +0100 |
| commit | 6a8484b63c421d3a69e6f560565d64e1de33d23d (patch) | |
| tree | f81e6868239c80e3480bd82ec3c2479d7a1c49fd /include | |
| parent | 270384ccfc2ba3849b9d02f7a37c395987c30ed2 (diff) | |
| parent | 1b9f1ae8907cb13d3d2538d98385b2744c9490d5 (diff) | |
Merge tag 'asoc-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.20
Nothing too exciting here yet, a small optimization for DAPM from
Lars-Peter and a few small bits and pieces for drivers but nothing
that really stands out.
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 */ |