diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 09:50:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 09:50:27 -0700 |
| commit | d0bbe0dd353af9521e9d8bc5236308c677b6f62a (patch) | |
| tree | a1142f3a5058d16504863ac777b21efdf1eca49e /net/atm | |
| parent | 8de29a35dc840a05e451ad035bcb06e21ccf605f (diff) | |
| parent | 0e4f93e5017d9d8080bbd34db17836e090eb46fe (diff) | |
| download | op-kernel-dev-d0bbe0dd353af9521e9d8bc5236308c677b6f62a.zip op-kernel-dev-d0bbe0dd353af9521e9d8bc5236308c677b6f62a.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Usual trivial tree updates. Nothing outstanding -- mostly printk()
and comment fixes and unused identifier removals"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
goldfish: goldfish_tty_probe() is not using 'i' any more
powerpc: Fix comment in smu.h
qla2xxx: Fix printks in ql_log message
lib: correct link to the original source for div64_u64
si2168, tda10071, m88ds3103: Fix firmware wording
usb: storage: Fix printk in isd200_log_config()
qla2xxx: Fix printk in qla25xx_setup_mode
init/main: fix reset_device comment
ipwireless: missing assignment
goldfish: remove unreachable line of code
coredump: Fix do_coredump() comment
stacktrace.h: remove duplicate declaration task_struct
smpboot.h: Remove unused function prototype
treewide: Fix typo in printk messages
treewide: Fix typo in printk messages
mod_devicetable: fix comment for match_flags
Diffstat (limited to 'net/atm')
| -rw-r--r-- | net/atm/mpoa_proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c index 5bdd300..2df34eb 100644 --- a/net/atm/mpoa_proc.c +++ b/net/atm/mpoa_proc.c @@ -272,7 +272,7 @@ static int parse_qos(const char *buff) qos.rxtp.max_pcr = rx_pcr; qos.rxtp.max_sdu = rx_sdu; qos.aal = ATM_AAL5; - dprintk("parse_qos(): setting qos paramameters to tx=%d,%d rx=%d,%d\n", + dprintk("parse_qos(): setting qos parameters to tx=%d,%d rx=%d,%d\n", qos.txtp.max_pcr, qos.txtp.max_sdu, qos.rxtp.max_pcr, qos.rxtp.max_sdu); |
