diff options
| author |   James Morris <james.l.morris@oracle.com> | 2014-07-26 10:38:59 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-26 10:38:59 +1000 |
| commit | ed3c4f8f862b9e79bafec3b85cde98c95807821e (patch) | |
| tree | c7532836f918e618dc5f02376482108dc8ccc48b | |
| parent | CAPABILITIES: remove undefined caps from all processes (diff) | |
| parent | PKCS#7: Missing inclusion of linux/err.h (diff) | |
| download | wireguard-linux-ed3c4f8f862b9e79bafec3b85cde98c95807821e.tar.xz wireguard-linux-ed3c4f8f862b9e79bafec3b85cde98c95807821e.zip | |
Merge tag 'keys-next-20140725' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to '')
| -rw-r--r-- | crypto/asymmetric_keys/pkcs7_key_type.c | 1 |
1 files changed, 1 insertions, 0 deletions
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> |