git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
tty
/
n_hdlc.c
diff --git
a/drivers/tty/n_hdlc.c
b/drivers/tty/n_hdlc.c
index
52fc0c9
..
cea5603
100644
(file)
--- 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>