diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /sound/pci/hda/patch_realtek.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
| -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 70583719282b..f7d5657b16b6 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -6619,7 +6619,7 @@ static struct hda_input_mux alc889A_mb31_capture_source = { | |||
| 6619 | /* Front Mic (0x01) unused */ | 6619 | /* Front Mic (0x01) unused */ |
| 6620 | { "Line", 0x2 }, | 6620 | { "Line", 0x2 }, |
| 6621 | /* Line 2 (0x03) unused */ | 6621 | /* Line 2 (0x03) unused */ |
| 6622 | /* CD (0x04) unsused? */ | 6622 | /* CD (0x04) unused? */ |
| 6623 | }, | 6623 | }, |
| 6624 | }; | 6624 | }; |
| 6625 | 6625 | ||