Merge tag 'keys-next-20140725' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next

2014-07-26 10:38:59 +10:00 · 2014-07-26 10:38:59 +10:00 · ed3c4f8f86
parent 7d8b6c6375 8f3438ccea
commit ed3c4f8f86
1 changed files with 1 additions and 0 deletions
--- a/crypto/asymmetric_keys/pkcs7_key_type.c
+++ b/crypto/asymmetric_keys/pkcs7_key_type.c
@ -11,6 +11,7 @@

 #define pr_fmt(fmt) "PKCS7key: "fmt
 #include <linux/key.h>
+#include <linux/err.h>
 #include <linux/key-type.h>
 #include <crypto/pkcs7.h>
 #include <keys/user-type.h>