diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-06-06 10:45:37 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-06-06 10:45:37 -0700 |
commit | 8dd06ef34b6e2f41b29fbf5fc1663780f2524285 (patch) | |
tree | d59152f37ea7b36c3cf1778e20b85239f89c4e77 /sound/pci/cs5535audio/cs5535audio_olpc.c | |
parent | Input: synaptics - add a second working PNP_ID for Lenovo T470s (diff) | |
parent | Input: iqs269a - add missing I2C dependency (diff) | |
download | linux-dev-8dd06ef34b6e2f41b29fbf5fc1663780f2524285.tar.xz linux-dev-8dd06ef34b6e2f41b29fbf5fc1663780f2524285.zip |
Merge branch 'next' into for-linus
Prepare input updates for 5.8 merge window.
Diffstat (limited to 'sound/pci/cs5535audio/cs5535audio_olpc.c')
-rw-r--r-- | sound/pci/cs5535audio/cs5535audio_olpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/cs5535audio/cs5535audio_olpc.c b/sound/pci/cs5535audio/cs5535audio_olpc.c index bd246b10636e..4e295303b041 100644 --- a/sound/pci/cs5535audio/cs5535audio_olpc.c +++ b/sound/pci/cs5535audio/cs5535audio_olpc.c @@ -111,7 +111,7 @@ static int olpc_mic_put(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *v) return 1; } -static struct snd_kcontrol_new olpc_cs5535audio_ctls[] = { +static const struct snd_kcontrol_new olpc_cs5535audio_ctls[] = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "DC Mode Enable", |