summaryrefslogtreecommitdiffstats
path: root/crypto/tea.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-20 18:17:34 +1200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-20 18:17:34 +1200
commit2262889091c15ef0c790be0b99ea6dae73c86a0b (patch)
treecb3500bb32ffba36e9892c2dad98bda001ea65ca /crypto/tea.c
parentb62a9c2058ee4c60677422fb7a8d6129320a4251 (diff)
parent3e14dcf7cb80b34a1f38b55bc96f02d23fdaaaaf (diff)
downloadblackbird-op-linux-2262889091c15ef0c790be0b99ea6dae73c86a0b.tar.gz
blackbird-op-linux-2262889091c15ef0c790be0b99ea6dae73c86a0b.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "This fixes a regression that arose from the change to add a crypto prefix to module names which was done to prevent the loading of arbitrary modules through the Crypto API. In particular, a number of modules were missing the crypto prefix which meant that they could no longer be autoloaded" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: add missing crypto module aliases
Diffstat (limited to 'crypto/tea.c')
-rw-r--r--crypto/tea.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/tea.c b/crypto/tea.c
index 495be2d0077d..b70b441c7d1e 100644
--- a/crypto/tea.c
+++ b/crypto/tea.c
@@ -270,6 +270,7 @@ static void __exit tea_mod_fini(void)
crypto_unregister_algs(tea_algs, ARRAY_SIZE(tea_algs));
}
+MODULE_ALIAS_CRYPTO("tea");
MODULE_ALIAS_CRYPTO("xtea");
MODULE_ALIAS_CRYPTO("xeta");
OpenPOWER on IntegriCloud