diff options
| author | Mark Brown <broonie@kernel.org> | 2015-07-16 22:35:01 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-16 22:35:01 +0200 |
| commit | 7d9fb377a747025232fe4e8d17e54ff8032aba27 (patch) | |
| tree | 275856c60130b84301673f3c9a302296227bee55 /sound/soc/codecs/wm8993.c | |
| parent | ASoC: drivers: Drop owner assignment from i2c_driver (diff) | |
| parent | ASoC: Constify reg_default tables (diff) | |
| download | linux-7d9fb377a747025232fe4e8d17e54ff8032aba27.tar.xz linux-7d9fb377a747025232fe4e8d17e54ff8032aba27.zip | |
Merge branches 'topic/owner' and 'topic/reg-default' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-max9877
Diffstat (limited to 'sound/soc/codecs/wm8993.c')
| -rw-r--r-- | sound/soc/codecs/wm8993.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index 3f4dfb95d2d7..9638accb74b9 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c @@ -41,7 +41,7 @@ static const char *wm8993_supply_names[WM8993_NUM_SUPPLIES] = { "SPKVDD", }; -static struct reg_default wm8993_reg_defaults[] = { +static const struct reg_default wm8993_reg_defaults[] = { { 1, 0x0000 }, /* R1 - Power Management (1) */ { 2, 0x6000 }, /* R2 - Power Management (2) */ { 3, 0x0000 }, /* R3 - Power Management (3) */ @@ -1595,7 +1595,7 @@ static int wm8993_resume(struct snd_soc_codec *codec) #endif /* Tune DC servo configuration */ -static struct reg_default wm8993_regmap_patch[] = { +static const struct reg_default wm8993_regmap_patch[] = { { 0x44, 3 }, { 0x56, 3 }, { 0x44, 0 }, |