diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 06:21:36 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-17 06:21:36 +0400 |
commit | 98c4514ff6e3072288770db66f91bdb15af8b433 (patch) | |
tree | eb5f2541e70d27144720e1735b463471025908f0 /arch/sparc/crypto/camellia_glue.c | |
parent | 644a9d3b66e6983c2c1f3b24c3006d49b184c871 (diff) | |
parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
download | linux-98c4514ff6e3072288770db66f91bdb15af8b433.tar.xz |
Merge 3.7-rc6 into char-misc-next
Diffstat (limited to 'arch/sparc/crypto/camellia_glue.c')
-rw-r--r-- | arch/sparc/crypto/camellia_glue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/crypto/camellia_glue.c b/arch/sparc/crypto/camellia_glue.c index 42905c084299..62c89af3fd3f 100644 --- a/arch/sparc/crypto/camellia_glue.c +++ b/arch/sparc/crypto/camellia_glue.c @@ -320,3 +320,5 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Camellia Cipher Algorithm, sparc64 camellia opcode accelerated"); MODULE_ALIAS("aes"); + +#include "crop_devid.c" |