diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:08 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:08 -0500 |
| commit | a29fb94ff48cba620e1ac1317f5eef5920ead3ff (patch) | |
| tree | 2fb8e026712bdf7848ea400e25118f6a58824a02 /sound/pci/hda/patch_conexant.c | |
| parent | 52a7a5835173af61b9f6c3038212370d9717526f (diff) | |
| parent | dd3533eca859a6debb1565503ec03e68354e08e0 (diff) | |
Merge commit alsa/devel into topic/misc
Conflicts:
include/sound/version.h
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index c578c28f368e..947785f43b28 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
| @@ -2187,6 +2187,7 @@ static struct snd_kcontrol_new cxt5066_mixer_master_olpc[] = { | |||
| 2187 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | | 2187 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | |
| 2188 | SNDRV_CTL_ELEM_ACCESS_TLV_READ | | 2188 | SNDRV_CTL_ELEM_ACCESS_TLV_READ | |
| 2189 | SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, | 2189 | SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, |
| 2190 | .subdevice = HDA_SUBDEV_AMP_FLAG, | ||
| 2190 | .info = snd_hda_mixer_amp_volume_info, | 2191 | .info = snd_hda_mixer_amp_volume_info, |
| 2191 | .get = snd_hda_mixer_amp_volume_get, | 2192 | .get = snd_hda_mixer_amp_volume_get, |
| 2192 | .put = snd_hda_mixer_amp_volume_put, | 2193 | .put = snd_hda_mixer_amp_volume_put, |