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 | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'sound/pci/hda')
-rw-r--r-- | sound/pci/hda/patch_cirrus.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/patch_cmedia.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 8ba306856d3..7b0446fa600 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c | |||
@@ -947,7 +947,7 @@ static void init_input(struct hda_codec *codec) | |||
947 | coef |= 0x0500; /* DMIC2 enable 2 channels, disable GPIO1 */ | 947 | coef |= 0x0500; /* DMIC2 enable 2 channels, disable GPIO1 */ |
948 | if (is_active_pin(codec, CS_DMIC1_PIN_NID)) | 948 | if (is_active_pin(codec, CS_DMIC1_PIN_NID)) |
949 | coef |= 0x1800; /* DMIC1 enable 2 channels, disable GPIO0 | 949 | coef |= 0x1800; /* DMIC1 enable 2 channels, disable GPIO0 |
950 | * No effect if SPDIF_OUT2 is slected in | 950 | * No effect if SPDIF_OUT2 is selected in |
951 | * IDX_SPDIF_CTL. | 951 | * IDX_SPDIF_CTL. |
952 | */ | 952 | */ |
953 | cs_vendor_coef_set(codec, IDX_ADC_CFG, coef); | 953 | cs_vendor_coef_set(codec, IDX_ADC_CFG, coef); |
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c index 780e1a72114..8917071d5b6 100644 --- a/sound/pci/hda/patch_cmedia.c +++ b/sound/pci/hda/patch_cmedia.c | |||
@@ -66,7 +66,7 @@ struct cmi_spec { | |||
66 | 66 | ||
67 | struct hda_pcm pcm_rec[2]; /* PCM information */ | 67 | struct hda_pcm pcm_rec[2]; /* PCM information */ |
68 | 68 | ||
69 | /* pin deafault configuration */ | 69 | /* pin default configuration */ |
70 | hda_nid_t pin_nid[NUM_PINS]; | 70 | hda_nid_t pin_nid[NUM_PINS]; |
71 | unsigned int def_conf[NUM_PINS]; | 71 | unsigned int def_conf[NUM_PINS]; |
72 | unsigned int pin_def_confs; | 72 | unsigned int pin_def_confs; |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 70583719282..f7d5657b16b 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 | ||