diff options
author | Miloslav Trmač <mitr@redhat.com> | 2010-08-23 20:37:55 +0200 |
---|---|---|
committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-23 20:37:55 +0200 |
commit | a6d3a923924a7b751981d93ade82854985abebba (patch) | |
tree | daffc684ce1ac14691efb64022779de2a4f586bf /crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_setof.c | |
parent | cc7a2bee6cd5688f44e7b0cf1d28722fabf4a80c (diff) | |
parent | 40b5088d61e6f0830302b253ad407d06e46364b6 (diff) | |
download | kernel-crypto-a6d3a923924a7b751981d93ade82854985abebba.tar.gz kernel-crypto-a6d3a923924a7b751981d93ade82854985abebba.tar.xz kernel-crypto-a6d3a923924a7b751981d93ade82854985abebba.zip |
Merge branch 'standalone-master' into standalone-rename
Diffstat (limited to 'crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_setof.c')
-rw-r--r-- | crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_setof.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_setof.c b/crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_setof.c index 2a343f2c166..aa1af729b6b 100644 --- a/crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_setof.c +++ b/crypto/userspace/libtomcrypt/pk/asn1/der/set/der_encode_setof.c @@ -9,7 +9,7 @@ * Tom St Denis, tomstdenis@gmail.com, http://libtom.org */ #include "tomcrypt.h" -#include <linux/slab.h> + /** @file der_encode_setof.c |