aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-sjoy.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-05-03 15:25:35 +0200
committerJiri Kosina <jkosina@suse.cz>2010-05-03 15:25:35 +0200
commitd6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch)
tree1c844b3ce8bd430becbbb74875898b08d9f89bb5 /drivers/hid/hid-sjoy.c
parentHID: split picolcd's operation_mode sysfs attribute (diff)
parentHID: add suspend/resume hooks for hid drivers (diff)
downloadlinux-dev-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.tar.xz
linux-dev-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.zip
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'drivers/hid/hid-sjoy.c')
-rw-r--r--drivers/hid/hid-sjoy.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c
index 203c438b016f..e10a7687ebf2 100644
--- a/drivers/hid/hid-sjoy.c
+++ b/drivers/hid/hid-sjoy.c
@@ -27,6 +27,7 @@
/* #define DEBUG */
#include <linux/input.h>
+#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/hid.h>
#include "hid-ids.h"