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

6c72139f · Linus Torvalds <[email protected]> · 2014-01-01 11:35:27 -08:00

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

Commit: 6c72139fb1268813b4fdf53a9aba0166f38d92cc
Parents: 6b8c982d · efb753b8

Merge commit. Changes below are compared with the first parent: 6b8c982d.

Changes

1 files changed · +1 −3

File	Status	Add	Del	Content
drivers/crypto/ixp4xx_crypto.c	modified	+1	−3	View file

drivers/crypto/ixp4xx_crypto.c

View file

diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
index 9dd6e01..f757a0f 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);
 