diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:47:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 19:47:22 -0500 |
commit | 9073e1a804c3096eda84ee7cbf11d1f174236c75 (patch) | |
tree | 2f1b488b606bc03f8c5ce133f9158196fef07cd2 /drivers/net/irda | |
parent | 4937e2a6f939a41bf811378e80d71f68aa0950c6 (diff) | |
parent | 2bb9936beac2eed0c1ed907f83694bc752e159d9 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual earth-shaking, news-breaking, rocket science pile from
trivial.git"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
doc: usb: Fix typo in Documentation/usb/gadget_configs.txt
doc: add missing files to timers/00-INDEX
timekeeping: Fix some trivial typos in comments
mm: Fix some trivial typos in comments
irq: Fix some trivial typos in comments
NUMA: fix typos in Kconfig help text
mm: update 00-INDEX
doc: Documentation/DMA-attributes.txt fix typo
DRM: comment: `halve' -> `half'
Docs: Kconfig: `devlopers' -> `developers'
doc: typo on word accounting in kprobes.c in mutliple architectures
treewide: fix "usefull" typo
treewide: fix "distingush" typo
mm/Kconfig: Grammar s/an/a/
kexec: Typo s/the/then/
Documentation/kvm: Update cpuid documentation for steal time and pv eoi
treewide: Fix common typo in "identify"
__page_to_pfn: Fix typo in comment
Correct some typos for word frequency
clk: fixed-factor: Fix a trivial typo
...
Diffstat (limited to 'drivers/net/irda')
-rw-r--r-- | drivers/net/irda/ali-ircc.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/nsc-ircc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 7bbd318bc93e..befa45f809c3 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -627,7 +627,7 @@ static int ali_ircc_setup(chipio_t *info) | |||
627 | /* | 627 | /* |
628 | * Function ali_ircc_read_dongle_id (int index, info) | 628 | * Function ali_ircc_read_dongle_id (int index, info) |
629 | * | 629 | * |
630 | * Try to read dongle indentification. This procedure needs to be executed | 630 | * Try to read dongle identification. This procedure needs to be executed |
631 | * once after power-on/reset. It also needs to be used whenever you suspect | 631 | * once after power-on/reset. It also needs to be used whenever you suspect |
632 | * that the user may have plugged/unplugged the IrDA Dongle. | 632 | * that the user may have plugged/unplugged the IrDA Dongle. |
633 | */ | 633 | */ |
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index ceeb53737f86..66bc03bdb138 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -1035,7 +1035,7 @@ static int nsc_ircc_setup(chipio_t *info) | |||
1035 | /* | 1035 | /* |
1036 | * Function nsc_ircc_read_dongle_id (void) | 1036 | * Function nsc_ircc_read_dongle_id (void) |
1037 | * | 1037 | * |
1038 | * Try to read dongle indentification. This procedure needs to be executed | 1038 | * Try to read dongle identification. This procedure needs to be executed |
1039 | * once after power-on/reset. It also needs to be used whenever you suspect | 1039 | * once after power-on/reset. It also needs to be used whenever you suspect |
1040 | * that the user may have plugged/unplugged the IrDA Dongle. | 1040 | * that the user may have plugged/unplugged the IrDA Dongle. |
1041 | */ | 1041 | */ |