iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2014-01-01 11:35:27 -08:00
parent 6b8c982d41 efb753b8e0
commit 6c72139fb1
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/crypto/ixp4xx_crypto.c
View File

@@ -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);