diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-12 11:50:03 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-12 11:50:03 -0500 |
| commit | c96350a298cf5ffab6eb340ced92418cbb699da4 (patch) | |
| tree | 079a1d43512d938b5c030477ae187d0812e78ef8 /sound | |
| parent | dba9532388b00d591d87c638a47dcc7ba3763fc5 (diff) | |
| parent | 9c0afc861a7228f718cb6a79fa7f9d46bf9ff300 (diff) | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index c7465053d6bb..e3caa78ccd54 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -15493,7 +15493,7 @@ static struct alc_config_preset alc861vd_presets[] = { | |||
| 15493 | static int alc861vd_auto_create_input_ctls(struct hda_codec *codec, | 15493 | static int alc861vd_auto_create_input_ctls(struct hda_codec *codec, |
| 15494 | const struct auto_pin_cfg *cfg) | 15494 | const struct auto_pin_cfg *cfg) |
| 15495 | { | 15495 | { |
| 15496 | return alc_auto_create_input_ctls(codec, cfg, 0x15, 0x09, 0); | 15496 | return alc_auto_create_input_ctls(codec, cfg, 0x15, 0x22, 0); |
| 15497 | } | 15497 | } |
| 15498 | 15498 | ||
| 15499 | 15499 | ||