diff options
author | Miloslav Trmač <mitr@redhat.com> | 2010-08-05 19:07:39 +0200 |
---|---|---|
committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-05 19:07:39 +0200 |
commit | 7494e29338fedcfeb5ed1e31eefe5742b786a2be (patch) | |
tree | aff3c02d6438da09084848b8cacecc0ea69a07e5 /crypto/userspace/ncr-key-wrap.c | |
parent | 0500602f83884ce74c9bf2daccdad1d51e45d5ee (diff) | |
parent | 0970369455d02b2fe40567ac4cc93d1250b47bab (diff) | |
download | kernel-crypto-7494e29338fedcfeb5ed1e31eefe5742b786a2be.tar.gz kernel-crypto-7494e29338fedcfeb5ed1e31eefe5742b786a2be.tar.xz kernel-crypto-7494e29338fedcfeb5ed1e31eefe5742b786a2be.zip |
Merge branch 'standalone-master' into standalone-rename
Diffstat (limited to 'crypto/userspace/ncr-key-wrap.c')
-rw-r--r-- | crypto/userspace/ncr-key-wrap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/userspace/ncr-key-wrap.c b/crypto/userspace/ncr-key-wrap.c index 34d8c527b83..d5d3df0fb43 100644 --- a/crypto/userspace/ncr-key-wrap.c +++ b/crypto/userspace/ncr-key-wrap.c @@ -23,6 +23,7 @@ */ #include <linux/mm.h> +#include <linux/slab.h> #include <linux/highmem.h> #include <linux/random.h> #include "cryptodev.h" |