diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 01:34:57 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 01:34:57 +0100 |
| commit | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch) | |
| tree | d956016f7aefff1030ca0f7885ac6a6f890a9e94 /drivers/char | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| parent | Documentation/filesystems/00-INDEX: remove entry for fat_cvf.txt (diff) | |
| download | linux-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.tar.xz linux-52347f4e810ba323d02cd2c26b5d738f4a2c3d5e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/n_hdlc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c index c3660d8781a4..a133a62f3d55 100644 --- a/drivers/char/n_hdlc.c +++ b/drivers/char/n_hdlc.c @@ -562,7 +562,7 @@ static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data, } /* end of n_hdlc_tty_receive() */ /** - * n_hdlc_tty_read - Called to retreive one frame of data (if available) + * n_hdlc_tty_read - Called to retrieve one frame of data (if available) * @tty - pointer to tty instance data * @file - pointer to open file object * @buf - pointer to returned data buffer |