summaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/yealink.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-01-23 17:10:44 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-01-23 17:10:44 +0100
commit55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch)
tree0850f490489e5b941692f3fe36dff5d2c1c35c3c /drivers/input/misc/yealink.c
parentInput: xpad - add new USB IDs for Logitech F310 and F710 (diff)
parentInput: wacom - add support for DTU-1031 (diff)
downloadlinux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.tar.xz
linux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.zip
Merge branch 'next' into for-linus
First round of input updates for 3.14.
Diffstat (limited to 'drivers/input/misc/yealink.c')
-rw-r--r--drivers/input/misc/yealink.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/misc/yealink.c b/drivers/input/misc/yealink.c
index 285a5bd6cbc9..79c964c075f1 100644
--- a/drivers/input/misc/yealink.c
+++ b/drivers/input/misc/yealink.c
@@ -47,7 +47,6 @@
*/
#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/rwsem.h>