Merge tag 'for-3.7-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[deliverable/linux.git] / crypto / camellia_generic.c

diff --git a/crypto/camellia_generic.c b/crypto/camellia_generic.c
index f7aaaaf869829c553cc34c90403b81a367762894..75efa20523053661e35fe209feaab50b418dc364 100644 (file)
--- a/crypto/camellia_generic.c
+++ b/crypto/camellia_generic.c
@@ -1072,7 +1072,6 @@ static struct crypto_alg camellia_alg = {
        .cra_ctxsize            =       sizeof(struct camellia_ctx),
        .cra_alignmask          =       3,
        .cra_module             =       THIS_MODULE,
-       .cra_list               =       LIST_HEAD_INIT(camellia_alg.cra_list),
        .cra_u                  =       {
                .cipher = {
                        .cia_min_keysize        =       CAMELLIA_MIN_KEY_SIZE,