include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / crypto / amcc / crypto4xx_core.c

diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c
index 857e35e..6c4c8b7 100644 (file)
--- a/drivers/crypto/amcc/crypto4xx_core.c
+++ b/drivers/crypto/amcc/crypto4xx_core.c
@@ -28,6 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/of_platform.h>
+#include <linux/slab.h>
 #include <asm/dcr.h>
 #include <asm/dcr-regs.h>
 #include <asm/cacheflush.h>
@@ -1144,25 +1145,6 @@ struct crypto4xx_alg_common crypto4xx_alg[] = {
                        }
                }
        }},
-       /* Hash SHA1 */
-       { .type = CRYPTO_ALG_TYPE_AHASH, .u.hash = {
-               .init           = crypto4xx_hash_init,
-               .update         = crypto4xx_hash_update,
-               .final          = crypto4xx_hash_final,
-               .digest         = crypto4xx_hash_digest,
-               .halg.digestsize = SHA1_DIGEST_SIZE,
-               .halg.base      = {
-                       .cra_name       = "sha1",
-                       .cra_driver_name = "sha1-ppc4xx",
-                       .cra_priority   = CRYPTO4XX_CRYPTO_PRIORITY,
-                       .cra_flags      = CRYPTO_ALG_ASYNC,
-                       .cra_blocksize  = SHA1_BLOCK_SIZE,
-                       .cra_ctxsize    = sizeof(struct crypto4xx_ctx),
-                       .cra_init       = crypto4xx_sha1_alg_init,
-                       .cra_exit       = crypto4xx_alg_exit,
-                       .cra_module     = THIS_MODULE,
-               }
-       }},
 };
 
 /**
@@ -1293,7 +1275,7 @@ static int __exit crypto4xx_remove(struct of_device *ofdev)
        return 0;
 }
 
-static struct of_device_id crypto4xx_match[] = {
+static const struct of_device_id crypto4xx_match[] = {
        { .compatible      = "amcc,ppc4xx-crypto",},
        { },
 };