git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
sound
/
pci
/
hda
/
patch_cmedia.c
diff --git
a/sound/pci/hda/patch_cmedia.c
b/sound/pci/hda/patch_cmedia.c
index
2468f31
..
6c54793
100644
(file)
--- a/
sound/pci/hda/patch_cmedia.c
+++ b/
sound/pci/hda/patch_cmedia.c
@@
-50,7
+50,7
@@
struct cmi_spec {
/* playback */
struct hda_multi_out multiout;
/* playback */
struct hda_multi_out multiout;
- hda_nid_t dac_nids[
4];
/* NID for each DAC */
+ hda_nid_t dac_nids[
AUTO_CFG_MAX_OUTS];
/* NID for each DAC */
int num_dacs;
/* capture */
int num_dacs;
/* capture */
@@
-73,7
+73,6
@@
struct cmi_spec {
unsigned int pin_def_confs;
/* multichannel pins */
unsigned int pin_def_confs;
/* multichannel pins */
- hda_nid_t multich_pin[4]; /* max 8-channel */
struct hda_verb multi_init[9]; /* 2 verbs for each pin + terminator */
};
struct hda_verb multi_init[9]; /* 2 verbs for each pin + terminator */
};