From d6b1565ab1a83a21599eaa724a01db745d1684e1 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Mon, 30 Jan 2012 21:14:31 +0100
Subject: [PATCH] --- yaml --- r: 289273 b: refs/heads/master c:
 a50f724a432997321cabb6c9e665c28e34850f78 h: refs/heads/master i:   289271:
 d95af0b96e6a7f43e75a0549641d13d4021aa8c6 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/tty/pty.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 41607f658204..1fe46cf561f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81f5835eae424be646753ec5a044ed4db1fcc09a
+refs/heads/master: a50f724a432997321cabb6c9e665c28e34850f78
diff --git a/trunk/drivers/tty/pty.c b/trunk/drivers/tty/pty.c
index d505837b3478..ddec9f3c3396 100644
--- a/trunk/drivers/tty/pty.c
+++ b/trunk/drivers/tty/pty.c
@@ -54,10 +54,7 @@ static void pty_close(struct tty_struct *tty, struct file *filp)
 	wake_up_interruptible(&tty->link->write_wait);
 	if (tty->driver->subtype == PTY_TYPE_MASTER) {
 		set_bit(TTY_OTHER_CLOSED, &tty->flags);
-#ifdef CONFIG_UNIX98_PTYS
-		if (tty->driver == ptm_driver)
-			devpts_pty_kill(tty->link);
-#endif
+		devpts_pty_kill(tty->link);
 		tty_unlock();
 		tty_vhangup(tty->link);
 		tty_lock();