diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:01:25 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 20:01:25 +0000 |
commit | 459d2a9f5fcf125ba736f7843189ccdfba11b1ff (patch) | |
tree | 6664f0ae653081521a3e1df0c506a2532ae6168e /arch/sparc/crypto/sha1_glue.c | |
parent | 1428c20f7c38e9fbf59923d1b9615ebdaf2862b7 (diff) | |
parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) |
Merge tag 'v3.7-rc7' into asoc-ux500
Linux 3.7-rc7
Diffstat (limited to 'arch/sparc/crypto/sha1_glue.c')
-rw-r--r-- | arch/sparc/crypto/sha1_glue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/crypto/sha1_glue.c b/arch/sparc/crypto/sha1_glue.c index 2bbb20bee9f..6cd5f29e1e0 100644 --- a/arch/sparc/crypto/sha1_glue.c +++ b/arch/sparc/crypto/sha1_glue.c @@ -181,3 +181,5 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, sparc64 sha1 opcode accelerated"); MODULE_ALIAS("sha1"); + +#include "crop_devid.c" |