Merge branch 'master' into next

[mv-sheeva.git] / security / lsm_audit.c

diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 8c3650672e23ca6764db5a0a07e722ed8396008b..908aa712816ac25bcb73fe22e6e704bd669d7566 100644 (file)
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -14,6 +14,7 @@
 #include <linux/types.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
+#include <linux/gfp.h>
 #include <linux/fs.h>
 #include <linux/init.h>
 #include <net/sock.h>