Hi,

On Wed, 2010-11-10 at 19:26 +0200, Dmitry Kasatkin wrote:
> diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
> index 9d65611..04cab70 100644
> --- a/drivers/crypto/omap-aes.c
> +++ b/drivers/crypto/omap-aes.c
> @@ -99,7 +99,7 @@ struct omap_aes_reqctx {
>  struct omap_aes_dev {
>       struct list_head        list;
>       unsigned long           phys_base;
> -     void __iomem            *io_base;
> +     void __iomem            *io_base;
>       struct clk              *iclk;
>       struct omap_aes_ctx     *ctx;
>       struct device           *dev;

this hunk is not part of this patch.

> @@ -752,7 +752,7 @@ static struct crypto_alg algs[] = {
>       .cra_flags              = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
>       .cra_blocksize          = AES_BLOCK_SIZE,
>       .cra_ctxsize            = sizeof(struct omap_aes_ctx),
> -     .cra_alignmask          = 0,
> +     .cra_alignmask          = 0,
>       .cra_type               = &crypto_ablkcipher_type,
>       .cra_module             = THIS_MODULE,
>       .cra_init               = omap_aes_cra_init,

not part of this patch.

> @@ -772,7 +772,7 @@ static struct crypto_alg algs[] = {
>       .cra_flags              = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
>       .cra_blocksize          = AES_BLOCK_SIZE,
>       .cra_ctxsize            = sizeof(struct omap_aes_ctx),
> -     .cra_alignmask          = 0,
> +     .cra_alignmask          = 0,
>       .cra_type               = &crypto_ablkcipher_type,
>       .cra_module             = THIS_MODULE,
>       .cra_init               = omap_aes_cra_init,

not part of this patch

-- 
balbi

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to