diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:34:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:34:57 -0500 |
| commit | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch) | |
| tree | d956016f7aefff1030ca0f7885ac6a6f890a9e94 /drivers/char | |
| parent | 1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6 (diff) | |
| parent | 48d727a9f93e617d6d443507acf7d1b849c63366 (diff) | |
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, | |||
| 562 | } /* end of n_hdlc_tty_receive() */ | 562 | } /* end of n_hdlc_tty_receive() */ |
| 563 | 563 | ||
| 564 | /** | 564 | /** |
| 565 | * n_hdlc_tty_read - Called to retreive one frame of data (if available) | 565 | * n_hdlc_tty_read - Called to retrieve one frame of data (if available) |
| 566 | * @tty - pointer to tty instance data | 566 | * @tty - pointer to tty instance data |
| 567 | * @file - pointer to open file object | 567 | * @file - pointer to open file object |
| 568 | * @buf - pointer to returned data buffer | 568 | * @buf - pointer to returned data buffer |