Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "Fix a build error on ARM that was introduced in 3.13-rc1"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ixp4xx - Fix kernel compile error

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
index 9dd6e01eac33..f757a0f428bd 100644
--- a/drivers/crypto/ixp4xx_crypto.c
+++ b/drivers/crypto/ixp4xx_crypto.c
@@ -1410,14 +1410,12 @@ static const struct platform_device_info ixp_dev_info __initdata = {
 static int __init ixp_module_init(void)
 {
         int num = ARRAY_SIZE(ixp4xx_algos);
-        int i, err ;
+        int i, err;
 
         pdev = platform_device_register_full(&ixp_dev_info);
         if (IS_ERR(pdev))
                 return PTR_ERR(pdev);
 
-        dev = &pdev->dev;
-
         spin_lock_init(&desc_lock);
         spin_lock_init(&emerg_lock);