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 master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
drivers
/
usb
/
serial
/
console.c
diff --git
a/drivers/usb/serial/console.c
b/drivers/usb/serial/console.c
index
3d456b3
..
3a9073d
100644
(file)
--- a/
drivers/usb/serial/console.c
+++ b/
drivers/usb/serial/console.c
@@
-17,11
+17,10
@@
#include <linux/tty.h>
#include <linux/console.h>
#include <linux/usb.h>
+#include <linux/usb/serial.h>
static int debug;
-#include "usb-serial.h"
-
struct usbcons_info {
int magic;
int break_flag;