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/jfs/acl.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/jfs/acl.c')
| -rw-r--r-- | fs/jfs/acl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c index 213169780b6c..1057a4998e4e 100644 --- a/fs/jfs/acl.c +++ b/fs/jfs/acl.c @@ -19,6 +19,7 @@ */ #include <linux/sched.h> +#include <linux/slab.h> #include <linux/fs.h> #include <linux/posix_acl_xattr.h> #include "jfs_incore.h" |