diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-13 09:15:58 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-13 15:21:35 +0800 |
| commit | 438628396ca8a44f6b710a73612939bc54633d7c (patch) | |
| tree | bf318740f48ff4699cd0154e900507597dae835e /crypto | |
| parent | 5afe132e300375c685e60d80d6e5e6a822d216d6 (diff) | |
| parent | 0d590a1ecd1ad44b2dae2bcdc5a6cb24a7080489 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Remove cpuinfo_arm64/cpuinfo_store_cpu() that comes from commit
42b34c73ae40(used for stable kernel only), since we have
newer commit 5aa9ef6f286.
Conflicts:
arch/arm64/include/asm/cputype.h
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"); |