diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-15 00:30:12 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-15 00:30:12 +0400 |
| commit | 54d5f88f25c38e5500a17b16240cb3775af00876 (patch) | |
| tree | 09208d460e2f5aa93f5d2cdbbb2c5972758994ea /arch/sparc/crypto/sha512_glue.c | |
| parent | 76cc43868c1e9d6344ad6c4992c4f6abd5204a8f (diff) | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| download | linux-54d5f88f25c38e5500a17b16240cb3775af00876.tar.xz | |
Merge v3.7-rc5 into tty-next
This pulls in the 3.7-rc5 fixes into tty-next to make it easier to test.
Diffstat (limited to 'arch/sparc/crypto/sha512_glue.c')
| -rw-r--r-- | arch/sparc/crypto/sha512_glue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/crypto/sha512_glue.c b/arch/sparc/crypto/sha512_glue.c index 486f0a2b7001..f04d1994d19a 100644 --- a/arch/sparc/crypto/sha512_glue.c +++ b/arch/sparc/crypto/sha512_glue.c @@ -224,3 +224,5 @@ MODULE_DESCRIPTION("SHA-384 and SHA-512 Secure Hash Algorithm, sparc64 sha512 op MODULE_ALIAS("sha384"); MODULE_ALIAS("sha512"); + +#include "crop_devid.c" |