git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
usb
/
serial
/
empeg.c
diff --git
a/drivers/usb/serial/empeg.c
b/drivers/usb/serial/empeg.c
index
63f7c78
..
daafe40
100644
(file)
--- a/
drivers/usb/serial/empeg.c
+++ b/
drivers/usb/serial/empeg.c
@@
-51,7
+51,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
@@
-63,7
+62,7
@@
#include <linux/spinlock.h>
#include <asm/uaccess.h>
#include <linux/usb.h>
#include <linux/spinlock.h>
#include <asm/uaccess.h>
#include <linux/usb.h>
-#include
"usb-serial.h"
+#include
<linux/usb/serial.h>
static int debug;
static int debug;
@@
-335,7
+334,7
@@
static void empeg_write_bulk_callback (struct urb *urb, struct pt_regs *regs)
return;
}
return;
}
-
schedule_work(&port->work
);
+
usb_serial_port_softint(port
);
}
}