OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
78f8baf
526af6e
)
Merge branch 'fix/hda' into topic/hda
author
Takashi Iwai
<tiwai@suse.de>
Wed, 7 Mar 2012 08:05:15 +0000
(09:05 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Wed, 7 Mar 2012 08:05:15 +0000
(09:05 +0100)
Conflicts:
sound/pci/hda/patch_realtek.c
1
2
sound/pci/hda/patch_realtek.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sound/pci/hda/patch_realtek.c
index
2ae6bfb
,
22c73b7
..
65955da
---
1
/
sound/pci/hda/patch_realtek.c
---
2
/
sound/pci/hda/patch_realtek.c
+++ b/
sound/pci/hda/patch_realtek.c
@@@
-2051,7
-2068,7
+2051,8
@@@
static int alc_build_controls(struct hd
*/
static void alc_init_special_input_src(struct hda_codec *codec);
+static void alc_auto_init_std(struct hda_codec *codec);
+ static int alc269_fill_coef(struct hda_codec *codec);
static int alc_init(struct hda_codec *codec)
{