summaryrefslogtreecommitdiff
path: root/crypto/ghash-generic.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2018-09-26 15:54:31 +0200
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2018-09-26 15:54:31 +0200
commit50d4fb1dc129955ab571c1dd7bf14cd07cc5984d (patch)
treee7667ecbd53d3985d294ea7ee64e33f9523cedff /crypto/ghash-generic.c
parent4ac44d603f290242cbba2e0d0383460412d55c04 (diff)
parenta41bb691f04fcf6d3fa1f6e743d1520e305bc71d (diff)
downloadlinux-crypto-50d4fb1dc129955ab571c1dd7bf14cd07cc5984d.tar.gz
linux-crypto-50d4fb1dc129955ab571c1dd7bf14cd07cc5984d.zip
Merge tag 'v4.19-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Sync with upstream (which now contains fbdev-v4.19 changes) to prepare a base for fbdev-v4.20 changes.
Diffstat (limited to 'crypto/ghash-generic.c')
-rw-r--r--crypto/ghash-generic.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/ghash-generic.c b/crypto/ghash-generic.c
index 1bffb3f7..d9f192b9 100644
--- a/crypto/ghash-generic.c
+++ b/crypto/ghash-generic.c
@@ -132,7 +132,6 @@ static struct shash_alg ghash_alg = {
.cra_name = "ghash",
.cra_driver_name = "ghash-generic",
.cra_priority = 100,
- .cra_flags = CRYPTO_ALG_TYPE_SHASH,
.cra_blocksize = GHASH_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct ghash_ctx),
.cra_module = THIS_MODULE,