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/hda/hda_codec.c | |
| parent | cc3a47a248d7791ef0d2c81a35c46769e55e4c6c (diff) | |
| parent | eeed4cd15ae0a8d3f2751adae8b56a3571e8aeca (diff) | |
Merge branch 'topic/for-4.12' into for-next
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 8fd745cb3f36..70bb365a08d2 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -1965,7 +1965,7 @@ static int vmaster_mute_mode_put(struct snd_kcontrol *kcontrol, return 1; } -static struct snd_kcontrol_new vmaster_mute_mode = { +static const struct snd_kcontrol_new vmaster_mute_mode = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Mute-LED Mode", .info = vmaster_mute_mode_info, @@ -2705,7 +2705,7 @@ static int spdif_share_sw_put(struct snd_kcontrol *kcontrol, return 0; } -static struct snd_kcontrol_new spdif_share_sw = { +static const struct snd_kcontrol_new spdif_share_sw = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "IEC958 Default PCM Playback Switch", .info = snd_ctl_boolean_mono_info, |