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 ...
This commit is contained in:
@@ -593,7 +593,7 @@ enum {
|
||||
|
||||
struct ac97_quirk {
|
||||
unsigned short subvendor; /* PCI subsystem vendor id */
|
||||
unsigned short subdevice; /* PCI sybsystem device id */
|
||||
unsigned short subdevice; /* PCI subsystem device id */
|
||||
unsigned short mask; /* device id bit mask, 0 = accept all */
|
||||
unsigned int codec_id; /* codec id (if any), 0 = accept all */
|
||||
const char *name; /* name shown as info */
|
||||
|
||||
@@ -36,7 +36,7 @@ struct wm8993_platform_data {
|
||||
unsigned int micbias1_lvl:1;
|
||||
unsigned int micbias2_lvl:1;
|
||||
|
||||
/* Jack detect threashold levels, see datasheet for values */
|
||||
/* Jack detect threshold levels, see datasheet for values */
|
||||
unsigned int jd_scthr:2;
|
||||
unsigned int jd_thr:2;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user