summaryrefslogtreecommitdiffstats
path: root/crypto/userspace/libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.c
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2010-08-23 20:38:06 +0200
committerMiloslav Trmač <mitr@redhat.com>2010-08-23 20:38:06 +0200
commit62441b5b1c30d8814dbe54287fd2a6efcd12549a (patch)
tree9e250319489f480822c4153714dfe3455ad42e63 /crypto/userspace/libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.c
parent9e46efe2918aeb0acd0805e55090c3552037f2df (diff)
parenta6d3a923924a7b751981d93ade82854985abebba (diff)
downloadkernel-crypto-62441b5b1c30d8814dbe54287fd2a6efcd12549a.tar.gz
kernel-crypto-62441b5b1c30d8814dbe54287fd2a6efcd12549a.tar.xz
kernel-crypto-62441b5b1c30d8814dbe54287fd2a6efcd12549a.zip
Merge branch 'standalone-rename' into userspace-crypto
Diffstat (limited to 'crypto/userspace/libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.c')
-rw-r--r--crypto/userspace/libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/userspace/libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.c b/crypto/userspace/libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.c
index 8a5005fa720..3ebb8ea977f 100644
--- a/crypto/userspace/libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.c
+++ b/crypto/userspace/libtomcrypt/pk/asn1/der/x509/der_decode_subject_public_key_info.c
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "tomcrypt.h"
-#include <linux/slab.h>
+
/**
@file der_encode_sequence_multi.c
ASN.1 DER, encode a Subject Public Key structure --nmav