diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-22 17:28:53 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-22 17:28:53 +0400 |
commit | 3efdb7f68530d783af73f6f547744d410d621ab7 (patch) | |
tree | 1015e208f398df17fd387982c366f04c1731a553 /sound | |
parent | f9061f2fc1e66264597c36ebb084fb8c35117e67 (diff) | |
parent | 0d59ff3a24ad099f741da5efd9e3e02bfd64496e (diff) | |
download | linux-3efdb7f68530d783af73f6f547744d410d621ab7.tar.xz |
Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/twl4030.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 8e6e5b016021..1e3884d6b3fb 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -137,8 +137,6 @@ static const u8 twl4030_reg[TWL4030_CACHEREGNUM] = { /* codec private data */ struct twl4030_priv { - struct snd_soc_codec codec; - unsigned int codec_powered; /* reference counts of AIF/APLL users */ |