diff options
author | James Morris <jmorris@namei.org> | 2010-05-06 00:56:07 (GMT) |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-05-06 00:56:07 (GMT) |
commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
tree | 81b1a2305d16c873371b65c5a863c0268036cefe /security/device_cgroup.c | |
parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
download | linux-fsl-qoriq-0ffbe2699cda6afbe08501098dff8a8c2fe6ae09.tar.xz |
Merge branch 'master' into next
Diffstat (limited to 'security/device_cgroup.c')
-rw-r--r-- | security/device_cgroup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index 37c5af6..8d9c48f 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c @@ -10,6 +10,7 @@ #include <linux/list.h> #include <linux/uaccess.h> #include <linux/seq_file.h> +#include <linux/slab.h> #include <linux/rcupdate.h> #include <linux/mutex.h> |