Merge tag 'keys-next-20140725' of...

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

Merge tag 'keys-next-20140725' of...
Merge tag 'keys-next-20140725' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
ed3c4f8f · James Morris · 7d8b6c63 · 8f3438cc · ed3c4f8f
Commit ed3c4f8f authored Jul 26, 2014 by James Morris
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

crypto/asymmetric_keys/pkcs7_key_type.c crypto/asymmetric_keys/pkcs7_key_type.c +1 -0

No files found.
--- 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>