From a4c93326d824167740ae7a3d8435565f70c670d4 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Sun, 21 May 2006 08:45:26 +1000 Subject: [PATCH] --- yaml --- r: 30575 b: refs/heads/master c: d913ea0d6b6a48dd6eed8fc5e299b8b10e049186 h: refs/heads/master i: 30573: 2c5a8b88d693c4f9a7b406506cd82abe8306f268 30571: 9ed8567949a7ddf92c8df34a4f0913124fd4b16f 30567: 4c7d0a3686a8832d5a2e49cd1ea63f653b1a4c7c 30559: dafb09c5f6bf921856625ed8d081275b075638ff v: v3 --- [refs] | 2 +- trunk/crypto/api.c | 2 +- trunk/include/linux/crypto.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 40b1891d3112..539d49e43794 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7fc05992afcf1d63d6d5fb6142c8d39094dbca9 +refs/heads/master: d913ea0d6b6a48dd6eed8fc5e299b8b10e049186 diff --git a/trunk/crypto/api.c b/trunk/crypto/api.c index 8145310d7985..735fdedd8217 100644 --- a/trunk/crypto/api.c +++ b/trunk/crypto/api.c @@ -229,7 +229,7 @@ void crypto_free_tfm(struct crypto_tfm *tfm) static inline int crypto_set_driver_name(struct crypto_alg *alg) { static const char suffix[] = "-generic"; - char *driver_name = (char *)alg->cra_driver_name; + char *driver_name = alg->cra_driver_name; int len; if (*driver_name) diff --git a/trunk/include/linux/crypto.h b/trunk/include/linux/crypto.h index 6c013c88080f..7f946241b879 100644 --- a/trunk/include/linux/crypto.h +++ b/trunk/include/linux/crypto.h @@ -128,8 +128,8 @@ struct crypto_alg { int cra_priority; - const char cra_name[CRYPTO_MAX_ALG_NAME]; - const char cra_driver_name[CRYPTO_MAX_ALG_NAME]; + char cra_name[CRYPTO_MAX_ALG_NAME]; + char cra_driver_name[CRYPTO_MAX_ALG_NAME]; union { struct cipher_alg cipher;