diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-22 21:21:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-22 21:21:55 -0800 |
| commit | bb1281f2aae08e5ef23eb0692c8833e95579cdf2 (patch) | |
| tree | e00abd368a90eb947df37ba1e6082c864635cb80 /drivers/isdn | |
| parent | 4988abf1749241bc80600a6b3283d03898d2717c (diff) | |
| parent | c04e7da0133fbe7f799b9356982371d228df9994 (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 rocket science stuff from trivial.git"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
neighbour.h: fix comment
sched: Fix warning on make htmldocs caused by wait.h
slab: struct kmem_cache is protected by slab_mutex
doc: Fix typo in USB Gadget Documentation
of/Kconfig: Spelling s/one/once/
mkregtable: Fix sscanf handling
lp5523, lp8501: comment improvements
thermal: rcar: comment spelling
treewide: fix comments and printk msgs
IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart()
Documentation: update /proc/uptime field description
Documentation: Fix size parameter for snprintf
arm: fix comment header and macro name
asm-generic: uaccess: Spelling s/a ny/any/
mtd: onenand: fix comment header
doc: driver-model/platform.txt: fix a typo
drivers: fix typo in DEVTMPFS_MOUNT Kconfig help text
doc: Fix typo (acces_process_vm -> access_process_vm)
treewide: Fix typos in printk
drivers/gpu/drm/qxl/Kconfig: reformat the help text
...
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/hisax/hfc4s8s_l1.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/mISDN/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c index c49c294fc81..414dbf6da89 100644 --- a/drivers/isdn/hisax/hfc4s8s_l1.c +++ b/drivers/isdn/hisax/hfc4s8s_l1.c @@ -1620,7 +1620,7 @@ hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent) #else if (!request_region(hw->iobase, 8, hw->card_name)) { printk(KERN_INFO - "HFC-4S/8S: failed to rquest address space at 0x%04x\n", + "HFC-4S/8S: failed to request address space at 0x%04x\n", hw->iobase); goto out; } diff --git a/drivers/isdn/mISDN/Kconfig b/drivers/isdn/mISDN/Kconfig index 1747a02a019..c0730d5c734 100644 --- a/drivers/isdn/mISDN/Kconfig +++ b/drivers/isdn/mISDN/Kconfig @@ -17,7 +17,7 @@ config MISDN_DSP This module may be used for special applications that require cross connecting of bchannels, conferencing, dtmf decoding, - echo cancelation, tone generation, and Blowfish encryption and + echo cancellation, tone generation, and Blowfish encryption and decryption. It may use hardware features if available. E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu |