From: James Morris <james.l.morris@oracle.com>
Date: Sat, 26 Jul 2014 00:38:59 +0000 (+1000)
Subject: Merge tag 'keys-next-20140725' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe... 
X-Git-Tag: firefly_0821_release~176^2~2675^2~30
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=ed3c4f8f862b9e79bafec3b85cde98c95807821e;hp=7d8b6c63751cfbbe5eef81a48c22978b3407a3ad

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

diff --git a/crypto/asymmetric_keys/pkcs7_key_type.c b/crypto/asymmetric_keys/pkcs7_key_type.c
index c2091f7bd15d..197ecdc0a5a1 100644
--- 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>