diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-20 06:26:44 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-20 06:26:44 +0200 |
| commit | 748c5151deb56e4b7b5a9b07a884243764933831 (patch) | |
| tree | e9dd45b8806d00b56503cfa55c46f3ebce0d151c /drivers/char/n_tty.c | |
| parent | [CIFS] ACL support part 5 (diff) | |
| parent | Revert "kconfig: tristate choices with mixed tristate and boolean values" (diff) | |
| download | linux-748c5151deb56e4b7b5a9b07a884243764933831.tar.xz linux-748c5151deb56e4b7b5a9b07a884243764933831.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/n_tty.c')
| -rw-r--r-- | drivers/char/n_tty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c index 038056911934..596c7173997b 100644 --- a/drivers/char/n_tty.c +++ b/drivers/char/n_tty.c @@ -437,7 +437,7 @@ static inline void finish_erasing(struct tty_struct *tty) * @c: character input * @tty: terminal device * - * Perform erase and neccessary output when an erase character is + * Perform erase and necessary output when an erase character is * present in the stream from the driver layer. Handles the complexities * of UTF-8 multibyte symbols. */ @@ -657,7 +657,7 @@ static inline void n_tty_receive_overrun(struct tty_struct *tty) * @c: character * * Process a parity error and queue the right data to indicate - * the error case if neccessary. Locking as per n_tty_receive_buf. + * the error case if necessary. Locking as per n_tty_receive_buf. */ static inline void n_tty_receive_parity_error(struct tty_struct *tty, unsigned char c) |