summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/max9860.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-11-15 13:04:13 +0300
committerJiri Kosina <jkosina@suse.cz>2017-11-15 13:04:13 +0300
commit5cc619db5c34146ee821acd08382b9d78579b52e (patch)
treeee28e3cefdb35d56e33887f05db0a50589aa5883 /sound/soc/codecs/max9860.c
parent83fd5ddc19931d5a5b884c43ee3c9d69c673bc96 (diff)
parent287b8e11972f934052f4ed0751df465a5e84b69c (diff)
downloadlinux-5cc619db5c34146ee821acd08382b9d78579b52e.tar.xz
Merge branch 'for-4.15/alps' into for-linus
- New ALPS touchpad (T4, found currently on HP EliteBook 1000, Zbook Stduio and HP Elite book x360) support from Masaki Ota
Diffstat (limited to 'sound/soc/codecs/max9860.c')
-rw-r--r--sound/soc/codecs/max9860.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/max9860.c b/sound/soc/codecs/max9860.c
index 499bdbfd0a2d..a2dc6a47f466 100644
--- a/sound/soc/codecs/max9860.c
+++ b/sound/soc/codecs/max9860.c
@@ -534,7 +534,7 @@ static int max9860_set_bias_level(struct snd_soc_codec *codec,
return 0;
}
-static struct snd_soc_codec_driver max9860_codec_driver = {
+static const struct snd_soc_codec_driver max9860_codec_driver = {
.set_bias_level = max9860_set_bias_level,
.idle_bias_off = true,