diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2016-03-06 14:57:44 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-03-06 14:57:44 +0200 |
| commit | 89ef41bfaa46f24a14b776f1cd78c0e0b39e54ce (patch) | |
| tree | 8371cf24800fffa1d768767a8bf3e498a9edaa34 /sound/soc/codecs/rt5659.h | |
| parent | 89916cc90a78fffbc4c3d7cb1f6540fb2e551804 (diff) | |
| parent | 00a1f0a93dea3cf1c141df79bfd06e7c9ee54162 (diff) | |
Merge 'net-next/master'
Needed by the upcoming merge of iwlwifi-next-for-kalle-2016-03-02 tag.
Diffstat (limited to 'sound/soc/codecs/rt5659.h')
| -rw-r--r-- | sound/soc/codecs/rt5659.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5659.h b/sound/soc/codecs/rt5659.h index 8f07ee903eaa..d31c9e5bcec8 100644 --- a/sound/soc/codecs/rt5659.h +++ b/sound/soc/codecs/rt5659.h @@ -1792,7 +1792,6 @@ struct rt5659_priv { struct snd_soc_codec *codec; struct rt5659_platform_data pdata; struct regmap *regmap; - struct i2c_client *i2c; struct gpio_desc *gpiod_ldo1_en; struct gpio_desc *gpiod_reset; struct snd_soc_jack *hs_jack; |