aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/codecs/max9877.c
diff options
context:
space:
mode:
authorGravatar Mark Brown <broonie@kernel.org> 2015-07-16 21:35:01 +0100
committerGravatar Mark Brown <broonie@kernel.org> 2015-07-16 21:35:01 +0100
commit7d9fb377a747025232fe4e8d17e54ff8032aba27 (patch)
tree275856c60130b84301673f3c9a302296227bee55 /sound/soc/codecs/max9877.c
parentASoC: drivers: Drop owner assignment from i2c_driver (diff)
parentASoC: Constify reg_default tables (diff)
downloadlinux-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/max9877.c')
-rw-r--r--sound/soc/codecs/max9877.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/max9877.c b/sound/soc/codecs/max9877.c
index 7692623ad5c3..e1df06fab756 100644
--- a/sound/soc/codecs/max9877.c
+++ b/sound/soc/codecs/max9877.c
@@ -22,7 +22,7 @@
static struct regmap *regmap;
-static struct reg_default max9877_regs[] = {
+static const struct reg_default max9877_regs[] = {
{ 0, 0x40 },
{ 1, 0x00 },
{ 2, 0x00 },