summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-10 16:05:56 +0400
committerArnd Bergmann <arnd@arndb.de>2012-07-12 19:35:42 +0400
commit14d597b74aed3c44af0ee8f5ea24b970a50aec99 (patch)
tree7cd25aa0621ccc82dd2b613656e74aacdf4afdde /security
parent8caec0d048609ccf8c75025b0d73af10f74e2157 (diff)
parentbd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff)
downloadlinux-14d597b74aed3c44af0ee8f5ea24b970a50aec99.tar.xz
Merge tag 'v3.5-rc6' into next/dt
New pull requests are based on Linux 3.5-rc6
Diffstat (limited to 'security')
-rw-r--r--security/security.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/security.c b/security/security.c
index 3efc9b12aef4..860aeb349cb3 100644
--- a/security/security.c
+++ b/security/security.c
@@ -23,6 +23,7 @@
#include <linux/mman.h>
#include <linux/mount.h>
#include <linux/personality.h>
+#include <linux/backing-dev.h>
#include <net/flow.h>
#define MAX_LSM_EVM_XATTR 2