diff options
author | Mark Brown <broonie@kernel.org> | 2015-07-16 21:35:01 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-07-16 21:35:01 +0100 |
commit | 7d9fb377a747025232fe4e8d17e54ff8032aba27 (patch) | |
tree | 275856c60130b84301673f3c9a302296227bee55 /sound/soc/codecs/wm8996.c | |
parent | 1c07a4de5baad76585f7ffb86b5b0bc34c33e8a6 (diff) | |
parent | c418a84a8c8f98b1a0f30cd68d0cdf40d77aed01 (diff) | |
download | linux-stable-7d9fb377a747025232fe4e8d17e54ff8032aba27.tar.gz linux-stable-7d9fb377a747025232fe4e8d17e54ff8032aba27.tar.bz2 linux-stable-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/wm8996.c')
-rw-r--r-- | sound/soc/codecs/wm8996.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 29b6688fb6ee..66c09556da79 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -117,7 +117,7 @@ WM8996_REGULATOR_EVENT(0) WM8996_REGULATOR_EVENT(1) WM8996_REGULATOR_EVENT(2) -static struct reg_default wm8996_reg[] = { +static const struct reg_default wm8996_reg[] = { { WM8996_POWER_MANAGEMENT_1, 0x0 }, { WM8996_POWER_MANAGEMENT_2, 0x0 }, { WM8996_POWER_MANAGEMENT_3, 0x0 }, |