Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / tty / n_tty.c

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 7e5e363..319d68c 100644 (file)
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -396,6 +396,7 @@ static inline int is_utf8_continuation(unsigned char c)
 /**
  *     is_continuation         -       multibyte check
  *     @c: byte to check
+ *     @tty: terminal device
  *
  *     Returns true if the utf8 character 'c' is a multibyte continuation
  *     character and the terminal is in unicode mode.
@@ -1668,6 +1669,7 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
  *     @cp: input chars
  *     @fp: flags for each char (if NULL, all chars are TTY_NORMAL)
  *     @count: number of input chars in @cp
+ *     @flow: enable flow control
  *
  *     Called by the terminal driver when a block of characters has
  *     been received. This function must be called from soft contexts