summaryrefslogtreecommitdiff
path: root/drivers/input/joydev.c
diff options
context:
space:
mode:
authorRadim Krčmář <rkrcmar@redhat.com>2017-01-17 17:53:01 +0100
committerRadim Krčmář <rkrcmar@redhat.com>2017-01-17 17:53:01 +0100
commita9ff720e0fee2f64c279e71c1bf86e93804295d2 (patch)
treec9d6a77274bcb90142aace2dd4a1c9808a191533 /drivers/input/joydev.c
parent21e7fbe7db2a983c046a05f12419d88c554a0f5a (diff)
parent06b35d93af0a5904aa832f58733be84ddbfe2e04 (diff)
Merge branch 'x86/cpufeature' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
For AVX512_VPOPCNTDQ.
Diffstat (limited to 'drivers/input/joydev.c')
-rw-r--r--drivers/input/joydev.c1
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>