diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
tree | 856ba96302a36014736747e8464f80eeb827bbdd /sound/pci/hda | |
parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
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 2439e84dcb21..4b200da1bd18 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c | |||
@@ -938,7 +938,7 @@ static void init_input(struct hda_codec *codec) | |||
938 | coef |= 0x0500; /* DMIC2 enable 2 channels, disable GPIO1 */ | 938 | coef |= 0x0500; /* DMIC2 enable 2 channels, disable GPIO1 */ |
939 | if (is_active_pin(codec, CS_DMIC1_PIN_NID)) | 939 | if (is_active_pin(codec, CS_DMIC1_PIN_NID)) |
940 | coef |= 0x1800; /* DMIC1 enable 2 channels, disable GPIO0 | 940 | coef |= 0x1800; /* DMIC1 enable 2 channels, disable GPIO0 |
941 | * No effect if SPDIF_OUT2 is slected in | 941 | * No effect if SPDIF_OUT2 is selected in |
942 | * IDX_SPDIF_CTL. | 942 | * IDX_SPDIF_CTL. |
943 | */ | 943 | */ |
944 | cs_vendor_coef_set(codec, IDX_ADC_CFG, coef); | 944 | 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 85c81feb10cf..a45c1169762b 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 d967836f36bb..db4a7367b625 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -6618,7 +6618,7 @@ static struct hda_input_mux alc889A_mb31_capture_source = { | |||
6618 | /* Front Mic (0x01) unused */ | 6618 | /* Front Mic (0x01) unused */ |
6619 | { "Line", 0x2 }, | 6619 | { "Line", 0x2 }, |
6620 | /* Line 2 (0x03) unused */ | 6620 | /* Line 2 (0x03) unused */ |
6621 | /* CD (0x04) unsused? */ | 6621 | /* CD (0x04) unused? */ |
6622 | }, | 6622 | }, |
6623 | }; | 6623 | }; |
6624 | 6624 | ||