diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-13 14:58:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-13 14:58:23 +0100 |
| commit | 3e8e2cc45c9d6b5c1265838a8cff701815321dbc (patch) | |
| tree | 708e85b74bac0427389d6f41e04522dfced1773c /sound/soc/codecs/wm8995.c | |
| parent | ASoC: sh: fsi-ak4642: fixup platform device id (diff) | |
| parent | ASoC: documentation updates (diff) | |
| download | linux-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.tar.xz linux-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.zip | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/codecs/wm8995.c')
| -rw-r--r-- | sound/soc/codecs/wm8995.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c index 96e0dc09f203..ac210ccebd4b 100644 --- a/sound/soc/codecs/wm8995.c +++ b/sound/soc/codecs/wm8995.c @@ -30,7 +30,7 @@ #include "wm8995.h" -static const u16 wm8995_reg_defs[WM8995_MAX_REGISTER + 1] __devinitconst = { +static const u16 wm8995_reg_defs[WM8995_MAX_REGISTER + 1] = { [0] = 0x8995, [5] = 0x0100, [16] = 0x000b, [17] = 0x000b, [24] = 0x02c0, [25] = 0x02c0, [26] = 0x02c0, [27] = 0x02c0, [28] = 0x000f, [32] = 0x0005, [33] = 0x0005, [40] = 0x0003, |