diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-10 16:25:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-10 16:25:50 -0400 |
| commit | 822b4b6fe38bbe23f6bc036288ecd934eef30be5 (patch) | |
| tree | 56a0b52b4cf0fc35927bdab91980ab648dd79862 /drivers/crypto | |
| parent | ae75d84f3e29a1832b35cd342ac471bbf30bce4c (diff) | |
| parent | 68be0b1ae355c6deb11326df6758f80154f44cf0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a build problem in sahara and temporarily disables two new
optimisations because of performance regressions until a permanent fix
is ready"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: sahara - fix building as module
crypto: blowfish - disable AVX2 implementation
crypto: twofish - disable AVX2 implementation
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/sahara.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index a97bb6c1596c..c3dc1c04a5df 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c | |||
| @@ -863,7 +863,7 @@ static struct of_device_id sahara_dt_ids[] = { | |||
| 863 | { .compatible = "fsl,imx27-sahara" }, | 863 | { .compatible = "fsl,imx27-sahara" }, |
| 864 | { /* sentinel */ } | 864 | { /* sentinel */ } |
| 865 | }; | 865 | }; |
| 866 | MODULE_DEVICE_TABLE(platform, sahara_dt_ids); | 866 | MODULE_DEVICE_TABLE(of, sahara_dt_ids); |
| 867 | 867 | ||
| 868 | static int sahara_probe(struct platform_device *pdev) | 868 | static int sahara_probe(struct platform_device *pdev) |
| 869 | { | 869 | { |