diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-03-20 12:24:26 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-03-20 12:24:26 +0100 |
| commit | ebe2aa911fc85b7c1ce6c433dec72a4b044b22c6 (patch) | |
| tree | da3eb908fb07f6ff6b67478b1352af4528d585db /sound/pci/aw2/aw2-alsa.c | |
| parent | cc3a47a248d7791ef0d2c81a35c46769e55e4c6c (diff) | |
| parent | eeed4cd15ae0a8d3f2751adae8b56a3571e8aeca (diff) | |
Merge branch 'topic/for-4.12' into for-next
Diffstat (limited to 'sound/pci/aw2/aw2-alsa.c')
| -rw-r--r-- | sound/pci/aw2/aw2-alsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index 57bbb87d0c62..8356180bfe0e 100644 --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c @@ -202,7 +202,7 @@ static const struct snd_pcm_ops snd_aw2_capture_ops = { .pointer = snd_aw2_pcm_pointer_capture, }; -static struct snd_kcontrol_new aw2_control = { +static const struct snd_kcontrol_new aw2_control = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "PCM Capture Route", .index = 0, |