diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-10 10:02:32 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-10 10:02:32 +0800 |
| commit | c577a32260e3c74bd2ccf42273c2f5cdf981b9a0 (patch) | |
| tree | 781fff52a3bb901f96a086ea788c08596ad396ce /crypto | |
| parent | e8f1cafd746408478934b9c8b9e9e0d5f450906c (diff) | |
| parent | 42f504e28a169ebfea0e3d9c6e151451800e41d5 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Most of cpu feature which hardcode in commit 3868e7f8d4799 are
included in compat_hwcap_str[]. We don't need repeat them.
Conflicts:
arch/arm64/kernel/setup.c
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crc32c.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/crc32c.c b/crypto/crc32c.c index 06f7018c9d95..238f0e627ef3 100644 --- a/crypto/crc32c.c +++ b/crypto/crc32c.c @@ -170,3 +170,4 @@ module_exit(crc32c_mod_fini); MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>"); MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations wrapper for lib/crc32c"); MODULE_LICENSE("GPL"); +MODULE_ALIAS_CRYPTO("crc32c"); |