diff options
| author | Paul Mundt | 2011-03-17 08:44:08 +0100 |
|---|---|---|
| committer | Paul Mundt | 2011-03-17 08:44:08 +0100 |
| commit | 1d2a1959fe534279cf37aba20b08c24c20840e52 (patch) | |
| tree | 67c0b9aa7fe22a44bf0b4af88947799203eb8f67 /drivers/tty/n_hdlc.c | |
| parent | sh: update sh7757lcr_defconfig (diff) | |
| parent | Merge branch 'mnt_devname' of git://git.kernel.org/pub/scm/linux/kernel/git/v... (diff) | |
| download | kernel-qcow2-linux-1d2a1959fe534279cf37aba20b08c24c20840e52.tar.gz kernel-qcow2-linux-1d2a1959fe534279cf37aba20b08c24c20840e52.tar.xz kernel-qcow2-linux-1d2a1959fe534279cf37aba20b08c24c20840e52.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'drivers/tty/n_hdlc.c')
| -rw-r--r-- | drivers/tty/n_hdlc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c index 52fc0c9a6364..cea56033b34c 100644 --- a/drivers/tty/n_hdlc.c +++ b/drivers/tty/n_hdlc.c @@ -97,7 +97,6 @@ #include <linux/slab.h> #include <linux/tty.h> #include <linux/errno.h> -#include <linux/smp_lock.h> #include <linux/string.h> /* used in new tty drivers */ #include <linux/signal.h> /* used in new tty drivers */ #include <linux/if.h> |