Merge branch 'frv' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux...

[~andy/linux] / drivers / tty / pty.c

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index c88029af84dd2a4f3dc95a9a6cabdc5f74fa9c03..210774726add12f9de8ef0c280360201b6791331 100644 (file)
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -23,7 +23,6 @@
 #include <linux/major.h>
 #include <linux/mm.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <linux/sysctl.h>
 #include <linux/device.h>
 #include <linux/uaccess.h>