projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/hda' into for-linus
[linux-2.6-microblaze.git]
/
sound
/
pci
/
hda
/
patch_analog.c
diff --git
a/sound/pci/hda/patch_analog.c
b/sound/pci/hda/patch_analog.c
index
5bb48ee
..
38ad3f7
100644
(file)
--- a/
sound/pci/hda/patch_analog.c
+++ b/
sound/pci/hda/patch_analog.c
@@
-3256,7
+3256,7
@@
static const char *ad1884_slave_vols[] = {
"Mic Playback Volume",
"CD Playback Volume",
"Internal Mic Playback Volume",
- "Docking Mic Playback Volume"
+ "Docking Mic Playback Volume"
,
/* "Beep Playback Volume", */
"IEC958 Playback Volume",
NULL