diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-05-02 08:24:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-05-02 08:24:42 +0200 |
| commit | d7dc450d5a7162de96edbed6b1792240c2f3a55f (patch) | |
| tree | d6dc2d26b393dd69881cd4b9498718f65b35abeb /sound/usb/line6/pcm.c | |
| parent | d4a2fbcee0c8449ce24d6de168f3d90c5e6d7596 (diff) | |
| parent | 0997e378be1d888a5d093eeee55f842cdfe55ebe (diff) | |
Merge branch 'for-next' into for-linus
For 4.12 merge.
Diffstat (limited to 'sound/usb/line6/pcm.c')
| -rw-r--r-- | sound/usb/line6/pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c index fab53f58d447..b3854f8c0c67 100644 --- a/sound/usb/line6/pcm.c +++ b/sound/usb/line6/pcm.c @@ -430,7 +430,7 @@ static int snd_line6_control_playback_put(struct snd_kcontrol *kcontrol, } /* control definition */ -static struct snd_kcontrol_new line6_controls[] = { +static const struct snd_kcontrol_new line6_controls[] = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "PCM Playback Volume", |