diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 15:25:35 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 15:25:35 +0200 |
commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /fs/proc/task_nommu.c | |
parent | HID: split picolcd's operation_mode sysfs attribute (diff) | |
parent | HID: add suspend/resume hooks for hid drivers (diff) | |
download | linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.tar.xz linux-d6d53cbc6b10d28646fb6184d1069f336ec76dc4.zip |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'fs/proc/task_nommu.c')
-rw-r--r-- | fs/proc/task_nommu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c index 5d9fd64ef81a..46d4b5d72bd3 100644 --- a/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c @@ -5,6 +5,7 @@ #include <linux/fs_struct.h> #include <linux/mount.h> #include <linux/ptrace.h> +#include <linux/slab.h> #include <linux/seq_file.h> #include "internal.h" |