aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-23 00:21:55 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-23 00:21:55 -0500
commitbb1281f2aae08e5ef23eb0692c8833e95579cdf2 (patch)
treee00abd368a90eb947df37ba1e6082c864635cb80 /drivers/isdn
parent4988abf1749241bc80600a6b3283d03898d2717c (diff)
parentc04e7da0133fbe7f799b9356982371d228df9994 (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.c2
-rw-r--r--drivers/isdn/mISDN/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index c49c294fc81e..414dbf6da89a 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)
1620#else 1620#else
1621 if (!request_region(hw->iobase, 8, hw->card_name)) { 1621 if (!request_region(hw->iobase, 8, hw->card_name)) {
1622 printk(KERN_INFO 1622 printk(KERN_INFO
1623 "HFC-4S/8S: failed to rquest address space at 0x%04x\n", 1623 "HFC-4S/8S: failed to request address space at 0x%04x\n",
1624 hw->iobase); 1624 hw->iobase);
1625 goto out; 1625 goto out;
1626 } 1626 }
diff --git a/drivers/isdn/mISDN/Kconfig b/drivers/isdn/mISDN/Kconfig
index 1747a02a019a..c0730d5c734d 100644
--- a/drivers/isdn/mISDN/Kconfig
+++ b/drivers/isdn/mISDN/Kconfig
@@ -17,7 +17,7 @@ config MISDN_DSP
17 17
18 This module may be used for special applications that require 18 This module may be used for special applications that require
19 cross connecting of bchannels, conferencing, dtmf decoding, 19 cross connecting of bchannels, conferencing, dtmf decoding,
20 echo cancelation, tone generation, and Blowfish encryption and 20 echo cancellation, tone generation, and Blowfish encryption and
21 decryption. It may use hardware features if available. 21 decryption. It may use hardware features if available.
22 22
23 E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu 23 E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu