Commit 6c72139f authored Jan 01, 2014 by Linus Torvalds

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

drivers/crypto/ixp4xx_crypto.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -1416,8 +1416,6 @@ static int __init ixp_module_init(void)
		if (IS_ERR(pdev))
		return PTR_ERR(pdev);

		dev = &pdev->dev;

		spin_lock_init(&desc_lock);
		spin_lock_init(&emerg_lock);