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/wm2200.c | |
| parent | 1c07a4de5baad76585f7ffb86b5b0bc34c33e8a6 (diff) | |
| parent | c418a84a8c8f98b1a0f30cd68d0cdf40d77aed01 (diff) | |
| download | linux-7d9fb377a747025232fe4e8d17e54ff8032aba27.tar.gz linux-7d9fb377a747025232fe4e8d17e54ff8032aba27.tar.bz2 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/wm2200.c')
| -rw-r--r-- | sound/soc/codecs/wm2200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index d4fa224d68b1..cdaa175283df 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -166,7 +166,7 @@ static const struct wm_adsp_region wm2200_dsp2_regions[] = { { .type = WMFW_ADSP1_ZM, .base = WM2200_DSP2_ZM_BASE }, }; -static struct reg_default wm2200_reg_defaults[] = { +static const struct reg_default wm2200_reg_defaults[] = { { 0x000B, 0x0000 }, /* R11 - Tone Generator 1 */ { 0x0102, 0x0000 }, /* R258 - Clocking 3 */ { 0x0103, 0x0011 }, /* R259 - Clocking 4 */ |