projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
127e82e
c39555d
)
Merge branch 'topic/fix/hda' into topic/hda
author
Takashi Iwai
<tiwai@suse.de>
Sat, 15 Nov 2008 18:05:21 +0000
(19:05 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Sat, 15 Nov 2008 18:05:21 +0000
(19:05 +0100)
Conflicts:
sound/pci/hda/patch_sigmatel.c
1
2
sound/pci/hda/patch_sigmatel.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sound/pci/hda/patch_sigmatel.c
index 66c12d3e9c7947021e40fbc1235b14b77e5de712,f205570def1c3a194682cb9b7f1344b0fec95615..6d9c634632d4f4a4ff2aab9a23283c04eb6ee4d8
---
1
/
sound/pci/hda/patch_sigmatel.c
---
2
/
sound/pci/hda/patch_sigmatel.c
+++ b/
sound/pci/hda/patch_sigmatel.c
@@@
-36,6
-35,9
+36,7
@@@
#include "hda_patch.h"
#include "hda_beep.h"
-#define NUM_CONTROL_ALLOC 32
-
+ #define STAC_VREF_EVENT 0x00
#define STAC_INSERT_EVENT 0x10
#define STAC_PWR_EVENT 0x20
#define STAC_HP_EVENT 0x30
This page took
0.028574 seconds
and
5
git commands to generate.