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/pci/cs4281.c | |
| parent | d4a2fbcee0c8449ce24d6de168f3d90c5e6d7596 (diff) | |
| parent | 0997e378be1d888a5d093eeee55f842cdfe55ebe (diff) | |
| download | talos-op-linux-d7dc450d5a7162de96edbed6b1792240c2f3a55f.tar.gz talos-op-linux-d7dc450d5a7162de96edbed6b1792240c2f3a55f.zip | |
Merge branch 'for-next' into for-linus
For 4.12 merge.
Diffstat (limited to 'sound/pci/cs4281.c')
| -rw-r--r-- | sound/pci/cs4281.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index fa7c51684dd2..f870697aca67 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c @@ -1055,7 +1055,7 @@ static int snd_cs4281_put_volume(struct snd_kcontrol *kcontrol, static const DECLARE_TLV_DB_SCALE(db_scale_dsp, -4650, 150, 0); -static struct snd_kcontrol_new snd_cs4281_fm_vol = +static const struct snd_kcontrol_new snd_cs4281_fm_vol = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Synth Playback Volume", @@ -1066,7 +1066,7 @@ static struct snd_kcontrol_new snd_cs4281_fm_vol = .tlv = { .p = db_scale_dsp }, }; -static struct snd_kcontrol_new snd_cs4281_pcm_vol = +static const struct snd_kcontrol_new snd_cs4281_pcm_vol = { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "PCM Stream Playback Volume", |
