diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
| commit | 0a75c23a009ff65f651532cecc16675d05f4de37 (patch) | |
| tree | bdcd6158758fe1810f0ddddb80d2816779518688 /drivers/char/n_hdlc.c | |
| parent | 34b8c399dc04c8e51f014b73458e654570698597 (diff) | |
| parent | db9edfd7e339ca4113153d887e782dd05be5a9eb (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/char/n_hdlc.c')
| -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 c3660d8781a..a133a62f3d5 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 |