aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/tty_ioctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 14:14:49 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 14:14:49 -0400
commit42933bac11e811f02200c944d8562a15f8ec4ff0 (patch)
treefcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/tty/tty_ioctl.c
parent2b9accbee563f535046ff2cd382d0acaa92e130c (diff)
parent25985edcedea6396277003854657b5f3cb31a628 (diff)
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings
Diffstat (limited to 'drivers/tty/tty_ioctl.c')
-rw-r--r--drivers/tty/tty_ioctl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 1a1135d580a2..21574cb32343 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -247,7 +247,7 @@ speed_t tty_termios_baud_rate(struct ktermios *termios)
247 cbaud = termios->c_cflag & CBAUD; 247 cbaud = termios->c_cflag & CBAUD;
248 248
249#ifdef BOTHER 249#ifdef BOTHER
250 /* Magic token for arbitary speed via c_ispeed/c_ospeed */ 250 /* Magic token for arbitrary speed via c_ispeed/c_ospeed */
251 if (cbaud == BOTHER) 251 if (cbaud == BOTHER)
252 return termios->c_ospeed; 252 return termios->c_ospeed;
253#endif 253#endif
@@ -283,7 +283,7 @@ speed_t tty_termios_input_baud_rate(struct ktermios *termios)
283 if (cbaud == B0) 283 if (cbaud == B0)
284 return tty_termios_baud_rate(termios); 284 return tty_termios_baud_rate(termios);
285 285
286 /* Magic token for arbitary speed via c_ispeed*/ 286 /* Magic token for arbitrary speed via c_ispeed*/
287 if (cbaud == BOTHER) 287 if (cbaud == BOTHER)
288 return termios->c_ispeed; 288 return termios->c_ispeed;
289 289
@@ -449,7 +449,7 @@ EXPORT_SYMBOL(tty_get_baud_rate);
449 * @new: New termios 449 * @new: New termios
450 * @old: Old termios 450 * @old: Old termios
451 * 451 *
452 * Propogate the hardware specific terminal setting bits from 452 * Propagate the hardware specific terminal setting bits from
453 * the old termios structure to the new one. This is used in cases 453 * the old termios structure to the new one. This is used in cases
454 * where the hardware does not support reconfiguration or as a helper 454 * where the hardware does not support reconfiguration or as a helper
455 * in some cases where only minimal reconfiguration is supported 455 * in some cases where only minimal reconfiguration is supported