diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 14:59:58 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 14:59:58 -0700 |
| commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
| tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /fs/sysfs/inode.c | |
| parent | e08cae4181af9483b04ecfac48f01c8e5a5f27bf (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
| download | op-kernel-dev-d7be0ce6afb1df60bc786f57410407ceae92b994.zip op-kernel-dev-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.gz | |
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'fs/sysfs/inode.c')
| -rw-r--r-- | fs/sysfs/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c index 082daae..a4a0a941 100644 --- a/fs/sysfs/inode.c +++ b/fs/sysfs/inode.c @@ -18,6 +18,7 @@ #include <linux/capability.h> #include <linux/errno.h> #include <linux/sched.h> +#include <linux/slab.h> #include <linux/xattr.h> #include <linux/security.h> #include "sysfs.h" |
