diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 11:21:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 11:21:12 -0700 |
| commit | 172f993a2941ec60685c7e33af8be701759de1ab (patch) | |
| tree | 2ee072d56de4a1bfe4ee6873941870837162ffba /include | |
| parent | 7272c30b6fbc051bf8a3f3c973e64f230c91c8b3 (diff) | |
| parent | e3fea3f70fd68af0574a5f24246cdb4ed07f2b74 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem bugfixes from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
selinux: fix selinux_inode_setxattr oops
KEYS: linux/key-type.h needs linux/errno.h
smack: off by one error
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/key-type.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/key-type.h b/include/linux/key-type.h index 39e3c082c49d..f0c651cda7b0 100644 --- a/include/linux/key-type.h +++ b/include/linux/key-type.h @@ -13,6 +13,7 @@ #define _LINUX_KEY_TYPE_H #include <linux/key.h> +#include <linux/errno.h> #ifdef CONFIG_KEYS |