summaryrefslogtreecommitdiff
path: root/include/crypto/null.h
diff options
context:
space:
mode:
authorJames Morris <james.morris@microsoft.com>2018-11-12 20:07:41 +0300
committerJames Morris <james.morris@microsoft.com>2018-11-12 20:07:41 +0300
commit26b76320a8a550472bbb8f42257df83fcb8d8df6 (patch)
tree8a5b569f4f070bf4971e24e7fccfe3004b8fc4ba /include/crypto/null.h
parentf09c296ebf407f98f4ca70892e612b54484bf663 (diff)
parentccda4af0f4b92f7b4c308d3acc262f4a7e3affad (diff)
downloadlinux-26b76320a8a550472bbb8f42257df83fcb8d8df6.tar.xz
Merge tag 'v4.20-rc2' into next-general
Sync to Linux 4.20-rc2 for downstream developers.
Diffstat (limited to 'include/crypto/null.h')
-rw-r--r--include/crypto/null.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/crypto/null.h b/include/crypto/null.h
index 15aeef6e30ef..0ef577cc00e3 100644
--- a/include/crypto/null.h
+++ b/include/crypto/null.h
@@ -9,7 +9,7 @@
#define NULL_DIGEST_SIZE 0
#define NULL_IV_SIZE 0
-struct crypto_skcipher *crypto_get_default_null_skcipher(void);
+struct crypto_sync_skcipher *crypto_get_default_null_skcipher(void);
void crypto_put_default_null_skcipher(void);
#endif