summaryrefslogtreecommitdiffstats
path: root/net/unix/sysctl_net_unix.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 /net/unix/sysctl_net_unix.c
parentHID: split picolcd's operation_mode sysfs attribute (diff)
parentHID: add suspend/resume hooks for hid drivers (diff)
downloadlinux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.tar.xz
linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.zip
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
-rw-r--r--net/unix/sysctl_net_unix.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index d095c7be10d0..397cffebb3b6 100644
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -10,6 +10,7 @@
*/
#include <linux/mm.h>
+#include <linux/slab.h>
#include <linux/sysctl.h>
#include <net/af_unix.h>