diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-15 20:24:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-15 20:24:05 -0500 |
| commit | c01c8106f43ec7e460eeb56c7a8ae666acdfe5a0 (patch) | |
| tree | 8d0d795f813db782ef950a1c0391c5755be007c1 /arch/x86/crypto | |
| parent | a4851d8f7d6351a395d36ae8fdcf41745a832d76 (diff) | |
| parent | 52f6c5ad430e41736133acac179607b224eaaa11 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ghash-intel - ghash-clmulni-intel_glue needs err.h
Diffstat (limited to 'arch/x86/crypto')
| -rw-r--r-- | arch/x86/crypto/ghash-clmulni-intel_glue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c index cbcc8d8ea93a..7a6e68e4f748 100644 --- a/arch/x86/crypto/ghash-clmulni-intel_glue.c +++ b/arch/x86/crypto/ghash-clmulni-intel_glue.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * by the Free Software Foundation. | 10 | * by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/err.h> | ||
| 13 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 15 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |