diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 17:10:44 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 17:10:44 +0100 |
commit | 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch) | |
tree | 0850f490489e5b941692f3fe36dff5d2c1c35c3c /drivers/input/tablet/kbtab.c | |
parent | Input: xpad - add new USB IDs for Logitech F310 and F710 (diff) | |
parent | Input: wacom - add support for DTU-1031 (diff) | |
download | linux-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/tablet/kbtab.c')
-rw-r--r-- | drivers/input/tablet/kbtab.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c index 3fba74b9b602..d2ac7c2b5b82 100644 --- a/drivers/input/tablet/kbtab.c +++ b/drivers/input/tablet/kbtab.c @@ -1,7 +1,6 @@ #include <linux/kernel.h> #include <linux/slab.h> #include <linux/module.h> -#include <linux/init.h> #include <linux/usb/input.h> #include <asm/unaligned.h> |