diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:06 (GMT) |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:06 (GMT) |
commit | 7a869e108e5d82b021a6ce10d25e97e6b7f5823a (patch) | |
tree | 27f832ff7b47b6d3200a084afd0c8ef4ad4a7078 /include | |
parent | 7d590e462315f40f821599bcc0b2b6b7f62142a8 (diff) | |
parent | 60d66c9a24907c8c965be4c7d15f67bd9d54b553 (diff) | |
download | linux-7a869e108e5d82b021a6ce10d25e97e6b7f5823a.tar.xz |
Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-next
Diffstat (limited to 'include')
-rw-r--r-- | include/sound/rt5677.h | 3 | ||||
-rw-r--r-- | include/sound/soc-dapm.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/rt5677.h b/include/sound/rt5677.h index d9eb7d8..a620704 100644 --- a/include/sound/rt5677.h +++ b/include/sound/rt5677.h @@ -37,6 +37,9 @@ struct rt5677_platform_data { OFF, GPIO4, GPIO5 and GPIO6 respectively */ unsigned int jd2_gpio; unsigned int jd3_gpio; + + /* Set MICBIAS1 VDD 1v8 or 3v3 */ + bool micbias1_vdd_3v3; }; #endif diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index a2a0cf6..8d7416e 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -525,7 +525,6 @@ struct snd_soc_dapm_widget { enum snd_soc_dapm_type id; const char *name; /* widget name */ const char *sname; /* stream name */ - struct snd_soc_codec *codec; struct list_head list; struct snd_soc_dapm_context *dapm; |