diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-06 11:35:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-06 11:35:44 -0400 |
| commit | 989db2005c328300239da4df4d80b057f8509d3b (patch) | |
| tree | 1f6c9528148416b0074c72c983503098ebcbcc27 /sound/soc/codecs/wm8776.c | |
| parent | c046fd4dd613b22b35379665a8f7656d17bde0b3 (diff) | |
| parent | 197ebd4053c42351e3737d83aebb33ed97ed2dd8 (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/wm8776.c')
| -rw-r--r-- | sound/soc/codecs/wm8776.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index 96474a40da8d..e09ed65e0868 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | /* codec private data */ | 34 | /* codec private data */ |
| 35 | struct wm8776_priv { | 35 | struct wm8776_priv { |
| 36 | enum snd_soc_control_type control_type; | 36 | enum snd_soc_control_type control_type; |
| 37 | u16 reg_cache[WM8776_CACHEREGNUM]; | ||
| 38 | int sysclk[2]; | 37 | int sysclk[2]; |
| 39 | }; | 38 | }; |
| 40 | 39 | ||