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 branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
[pandora-kernel.git]
/
drivers
/
serial
/
serial_core.c
diff --git
a/drivers/serial/serial_core.c
b/drivers/serial/serial_core.c
index
76418c1
..
460a72d
100644
(file)
--- a/
drivers/serial/serial_core.c
+++ b/
drivers/serial/serial_core.c
@@
-29,7
+29,6
@@
#include <linux/console.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
-#include <linux/smp_lock.h>
#include <linux/device.h>
#include <linux/serial.h> /* for serial_state and serial_icounter_struct */
#include <linux/serial_core.h>