Commit 6c72139f authored by Linus Torvalds's avatar Linus Torvalds

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
parents 6b8c982d efb753b8
...@@ -1410,14 +1410,12 @@ static const struct platform_device_info ixp_dev_info __initdata = { ...@@ -1410,14 +1410,12 @@ static const struct platform_device_info ixp_dev_info __initdata = {
static int __init ixp_module_init(void) static int __init ixp_module_init(void)
{ {
int num = ARRAY_SIZE(ixp4xx_algos); int num = ARRAY_SIZE(ixp4xx_algos);
int i, err ; int i, err;
pdev = platform_device_register_full(&ixp_dev_info); pdev = platform_device_register_full(&ixp_dev_info);
if (IS_ERR(pdev)) if (IS_ERR(pdev))
return PTR_ERR(pdev); return PTR_ERR(pdev);
dev = &pdev->dev;
spin_lock_init(&desc_lock); spin_lock_init(&desc_lock);
spin_lock_init(&emerg_lock); spin_lock_init(&emerg_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment