Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6

[karo-tx-linux.git] / drivers / char / pty.c

diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index f373d0155a77bf1d81a990ec3f556c051f079499..9491e43075667be1f1e48ada2803bc77ae5a7b54 100644 (file)
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -100,7 +100,7 @@ static void pty_unthrottle(struct tty_struct * tty)
  *
  * FIXME: Our pty_write method is called with our ldisc lock held but
  * not our partners. We can't just take the other one blindly without
- * risking deadlocks.  There is also the small matter of TTY_DONT_FLIP
+ * risking deadlocks.
  */
 static int pty_write(struct tty_struct * tty, const unsigned char *buf, int count)
 {