Merge branch 'master' into upstream

[firefly-linux-kernel-4.4.55.git] / drivers / hid / hidraw.c

diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index eb16cd143e2a4d58edd38ffebec3c8f25661112a..68d087f63c02d278a06abb12c42bf015c673c99b 100644 (file)
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -34,7 +34,6 @@
 #include <linux/hid.h>
 #include <linux/mutex.h>
 #include <linux/sched.h>
-#include <linux/smp_lock.h>
 
 #include <linux/hidraw.h>