From 96c2974130d5cd0635ba7fb89a3341bebd668453 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 16 Nov 2011 16:27:10 +0100
Subject: [PATCH] --- yaml --- r: 280679 b: refs/heads/master c:
 8b3ffa173ffa13ac47c1d7524af92d4b2c95abfc h: refs/heads/master i:   280677:
 c7c15a8c0697c3d6df31c8c9324d36ef19fd5701   280675:
 1f2e203dac45d42e006ef0cb138087e28e365dd3   280671:
 faa1e5b5231f39667de693de8ff9257b88ff9692 v: v3

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

diff --git a/[refs] b/[refs]
index d22fd3005913..45988f5131c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 484af54d432c39891ff27ad0e5194d28513063cc
+refs/heads/master: 8b3ffa173ffa13ac47c1d7524af92d4b2c95abfc
diff --git a/trunk/drivers/tty/tty_ldisc.c b/trunk/drivers/tty/tty_ldisc.c
index 5201f78d39a6..174db3b0c09e 100644
--- a/trunk/drivers/tty/tty_ldisc.c
+++ b/trunk/drivers/tty/tty_ldisc.c
@@ -1,19 +1,11 @@
 #include <linux/types.h>
-#include <linux/major.h>
 #include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/fcntl.h>
+#include <linux/kmod.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-#include <linux/devpts_fs.h>
 #include <linux/file.h>
-#include <linux/console.h>
-#include <linux/timer.h>
-#include <linux/ctype.h>
-#include <linux/kd.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/slab.h>
@@ -24,18 +16,8 @@
 #include <linux/device.h>
 #include <linux/wait.h>
 #include <linux/bitops.h>
-#include <linux/delay.h>
 #include <linux/seq_file.h>
-
 #include <linux/uaccess.h>
-#include <asm/system.h>
-
-#include <linux/kbd_kern.h>
-#include <linux/vt_kern.h>
-#include <linux/selection.h>
-
-#include <linux/kmod.h>
-#include <linux/nsproxy.h>
 
 /*
  *	This guards the refcounted line discipline lists. The lock