git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream
[pandora-kernel.git]
/
drivers
/
hid
/
usbhid
/
hiddev.c
diff --git
a/drivers/hid/usbhid/hiddev.c
b/drivers/hid/usbhid/hiddev.c
index
fb78f75
..
af0a7c1
100644
(file)
--- a/
drivers/hid/usbhid/hiddev.c
+++ b/
drivers/hid/usbhid/hiddev.c
@@
-29,7
+29,6
@@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <linux/smp_lock.h>
#include <linux/input.h>
#include <linux/usb.h>
#include <linux/hid.h>