diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-11-25 23:47:38 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-11-25 23:47:38 +0100 |
commit | d3de94ba4e58e8043d500f7335797d6a2ac93248 (patch) | |
tree | 8382a170965eec00ebfe62e7b42dfdea9ca44f54 /arch/arm64/crypto/aes-ce-cipher.c | |
parent | Merge tag 'imx-fixes-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sh... (diff) | |
parent | Linux 4.4-rc2 (diff) | |
download | linux-d3de94ba4e58e8043d500f7335797d6a2ac93248.tar.xz linux-d3de94ba4e58e8043d500f7335797d6a2ac93248.zip |
Merge tag 'v4.4-rc2' into fixes
Linux 4.4-rc2 is backmerged from the keystone fixes.
Diffstat (limited to 'arch/arm64/crypto/aes-ce-cipher.c')
-rw-r--r-- | arch/arm64/crypto/aes-ce-cipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/crypto/aes-ce-cipher.c b/arch/arm64/crypto/aes-ce-cipher.c index ce47792a983d..f7bd9bf0bbb3 100644 --- a/arch/arm64/crypto/aes-ce-cipher.c +++ b/arch/arm64/crypto/aes-ce-cipher.c @@ -237,7 +237,7 @@ EXPORT_SYMBOL(ce_aes_setkey); static struct crypto_alg aes_alg = { .cra_name = "aes", .cra_driver_name = "aes-ce", - .cra_priority = 300, + .cra_priority = 250, .cra_flags = CRYPTO_ALG_TYPE_CIPHER, .cra_blocksize = AES_BLOCK_SIZE, .cra_ctxsize = sizeof(struct crypto_aes_ctx), |