summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/wishbone-serial.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-04-03 18:26:49 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-04-03 18:26:49 +0200
commit692d96552c9a86a919fe6b5b82288a6c77c015a5 (patch)
treea9e49c040d361ea2293a8966832378def5a06714 /drivers/usb/serial/wishbone-serial.c
parentInput: mousedev - fix race when creating mixed device (diff)
parentInput: edt-ft5x06 - add a missing condition (diff)
downloadlinux-692d96552c9a86a919fe6b5b82288a6c77c015a5.tar.xz
linux-692d96552c9a86a919fe6b5b82288a6c77c015a5.zip
Merge branch 'next' into for-linus
First round of input updates for 3.15.
Diffstat (limited to 'drivers/usb/serial/wishbone-serial.c')
-rw-r--r--drivers/usb/serial/wishbone-serial.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/serial/wishbone-serial.c b/drivers/usb/serial/wishbone-serial.c
index 100573c6f19e..4fed4a0bd702 100644
--- a/drivers/usb/serial/wishbone-serial.c
+++ b/drivers/usb/serial/wishbone-serial.c
@@ -11,7 +11,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/tty.h>
#include <linux/module.h>
#include <linux/usb.h>