diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 13:57:53 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-16 13:57:53 +0300 |
| commit | a47b66da0380dd1ebcf2fbfa5fc41c4b6af8a460 (patch) | |
| tree | 3e1e18183f2041d534a1a763af95df1ec460e044 /drivers/input/joydev.c | |
| parent | 1129d270cbfbb7e2b1ec3dede4a13930bdd10e41 (diff) | |
| parent | 49def1853334396f948dcb4cedb9347abb318df5 (diff) | |
| download | linux-a47b66da0380dd1ebcf2fbfa5fc41c4b6af8a460.tar.xz | |
Merge 4.10-rc4 into usb-next
We need the USB fixes in here to make merges easier/possible with the
other sub-maintainer USB trees.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/joydev.c')
| -rw-r--r-- | drivers/input/joydev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index f3135ae22df4..abd18f31b24f 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -22,7 +22,6 @@ #include <linux/sched.h> #include <linux/slab.h> #include <linux/mm.h> -#include <linux/miscdevice.h> #include <linux/module.h> #include <linux/poll.h> #include <linux/init.h> |