commit c01c8106f43ec7e460eeb56c7a8ae666acdfe5a0
author Linus Torvalds <torvalds@linux-foundation.org> Wed Dec 15 17:24:05 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Dec 15 17:24:05 2010 -0800
tree 8d0d795f813db782ef950a1c0391c5755be007c1
parent a4851d8f7d6351a395d36ae8fdcf41745a832d76
parent 52f6c5ad430e41736133acac179607b224eaaa11

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

arch/x86/crypto/ghash-clmulni-intel_glue.c

diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c
index cbcc8d8..7a6e68e 100644
--- a/arch/x86/crypto/ghash-clmulni-intel_glue.c
+++ b/arch/x86/crypto/ghash-clmulni-intel_glue.c
@@ -10,6 +10,7 @@
  * by the Free Software Foundation.
  */
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>