summaryrefslogtreecommitdiff
path: root/crypto/hmac.c
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2010-05-16 19:40:56 -0300
committerHenrique de Moraes Holschuh <hmh@hmh.eng.br>2010-05-16 19:40:56 -0300
commit1c93dc3bd2d1f3f22f021b036c647db1316a7083 (patch)
tree1678134117b42ea7af7d7b4c1f10e864d486ae25 /crypto/hmac.c
parent39fa904443d5fef09dfeb90b94ec9892a5a96a35 (diff)
parent30800d10f2872689cd78711f26b065494df8bb74 (diff)
downloadlinux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.tar.gz
linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.zip
Merge mainline (v2.6.34-rc7)
Diffstat (limited to 'crypto/hmac.c')
-rw-r--r--crypto/hmac.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/hmac.c b/crypto/hmac.c
index 15c2eb53..8d9544cf 100644
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -23,7 +23,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/scatterlist.h>
-#include <linux/slab.h>
#include <linux/string.h>
struct hmac_ctx {