diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-09-04 11:10:27 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-09-04 11:10:27 +0300 |
commit | 2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91 (patch) | |
tree | 1cd995a5f989c879d3d71566a1fa2db9745c5263 /sound/pci/hda/patch_analog.c | |
parent | 1f7f51a63114bab3a05920f4b1343154e95e2cb6 (diff) | |
parent | 39cdc62b1b4efa39831d4de22f990043b0304fff (diff) | |
download | linux-2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91.tar.xz |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
-rw-r--r-- | sound/pci/hda/patch_analog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index e0fb8c6d1bc2..757857313426 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -505,7 +505,7 @@ static int ad1983_auto_smux_enum_put(struct snd_kcontrol *kcontrol, return 1; } -static struct snd_kcontrol_new ad1983_auto_smux_mixer = { +static const struct snd_kcontrol_new ad1983_auto_smux_mixer = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "IEC958 Playback Source", .info = ad1983_auto_smux_enum_info, @@ -788,7 +788,7 @@ static int ad1988_auto_smux_enum_put(struct snd_kcontrol *kcontrol, return 1; } -static struct snd_kcontrol_new ad1988_auto_smux_mixer = { +static const struct snd_kcontrol_new ad1988_auto_smux_mixer = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "IEC958 Playback Source", .info = ad1988_auto_smux_enum_info, |