summaryrefslogtreecommitdiffstats
path: root/crypto/lzo.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-01-15 09:46:14 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-01-15 09:46:14 -0800
commit0c49cd295d42d0032af11d55e2140dbec11dc8d0 (patch)
tree1e7d0e50b6b6d6e4de1fb6bb0b6d856c3932da58 /crypto/lzo.c
parent0c3e99437a66e4c869c60c2398449e6d98f3a988 (diff)
parenteaa27f34e91a14cdceed26ed6c6793ec1d186115 (diff)
Merge tag 'v3.19-rc4' into next
Merge with mainline to bring in the latest thermal and other changes.
Diffstat (limited to 'crypto/lzo.c')
-rw-r--r--crypto/lzo.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/lzo.c b/crypto/lzo.c
index a8ff2f778dc..4b3e92525da 100644
--- a/crypto/lzo.c
+++ b/crypto/lzo.c
@@ -107,3 +107,4 @@ module_exit(lzo_mod_fini);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("LZO Compression Algorithm");
+MODULE_ALIAS_CRYPTO("lzo");