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/emu10k1/emupcm.c | |
| parent | cc3a47a248d7791ef0d2c81a35c46769e55e4c6c (diff) | |
| parent | eeed4cd15ae0a8d3f2751adae8b56a3571e8aeca (diff) | |
Merge branch 'topic/for-4.12' into for-next
Diffstat (limited to 'sound/pci/emu10k1/emupcm.c')
| -rw-r--r-- | sound/pci/emu10k1/emupcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 37be1e14d756..ef1cf530c929 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -1542,7 +1542,7 @@ static int snd_emu10k1_pcm_efx_voices_mask_put(struct snd_kcontrol *kcontrol, st return change; } -static struct snd_kcontrol_new snd_emu10k1_pcm_efx_voices_mask = { +static const struct snd_kcontrol_new snd_emu10k1_pcm_efx_voices_mask = { .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = "Captured FX8010 Outputs", .info = snd_emu10k1_pcm_efx_voices_mask_info, |