Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: nx - Add missing header inclusions

The gutting of crypto/ctr.h uncovered missing header inclusions.
Add them.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Herbert Xu ab0f46ce 5f3437e9

+21 -12
+5 -3
drivers/crypto/nx/nx-aes-cbc.c
··· 8 8 */ 9 9 10 10 #include <crypto/aes.h> 11 - #include <crypto/algapi.h> 11 + #include <crypto/internal/skcipher.h> 12 + #include <linux/err.h> 13 + #include <linux/kernel.h> 12 14 #include <linux/module.h> 13 - #include <linux/types.h> 14 - #include <linux/crypto.h> 15 + #include <linux/spinlock.h> 16 + #include <linux/string.h> 15 17 #include <asm/vio.h> 16 18 17 19 #include "nx_csbcpb.h"
+5 -3
drivers/crypto/nx/nx-aes-ctr.c
··· 9 9 10 10 #include <crypto/aes.h> 11 11 #include <crypto/ctr.h> 12 - #include <crypto/algapi.h> 12 + #include <crypto/internal/skcipher.h> 13 + #include <linux/err.h> 14 + #include <linux/kernel.h> 13 15 #include <linux/module.h> 14 - #include <linux/types.h> 15 - #include <linux/crypto.h> 16 + #include <linux/spinlock.h> 17 + #include <linux/string.h> 16 18 #include <asm/vio.h> 17 19 18 20 #include "nx_csbcpb.h"
+5 -3
drivers/crypto/nx/nx-aes-ecb.c
··· 8 8 */ 9 9 10 10 #include <crypto/aes.h> 11 - #include <crypto/algapi.h> 11 + #include <crypto/internal/skcipher.h> 12 + #include <linux/err.h> 13 + #include <linux/kernel.h> 12 14 #include <linux/module.h> 13 - #include <linux/types.h> 14 - #include <linux/crypto.h> 15 + #include <linux/spinlock.h> 16 + #include <linux/string.h> 15 17 #include <asm/vio.h> 16 18 17 19 #include "nx_csbcpb.h"
+2 -2
drivers/crypto/nx/nx.c
··· 7 7 * Author: Kent Yoder <yoder1@us.ibm.com> 8 8 */ 9 9 10 + #include <crypto/aes.h> 10 11 #include <crypto/internal/aead.h> 11 12 #include <crypto/internal/hash.h> 12 - #include <crypto/aes.h> 13 + #include <crypto/internal/skcipher.h> 13 14 #include <crypto/sha2.h> 14 - #include <crypto/algapi.h> 15 15 #include <crypto/scatterwalk.h> 16 16 #include <linux/module.h> 17 17 #include <linux/moduleparam.h>
+4 -1
drivers/crypto/nx/nx.h
··· 4 4 #define __NX_H__ 5 5 6 6 #include <crypto/ctr.h> 7 + #include <crypto/internal/aead.h> 8 + #include <crypto/internal/hash.h> 9 + #include <crypto/internal/skcipher.h> 7 10 8 11 #define NX_NAME "nx-crypto" 9 12 #define NX_STRING "IBM Power7+ Nest Accelerator Crypto Driver" ··· 142 139 } priv; 143 140 }; 144 141 145 - struct crypto_aead; 142 + struct scatterlist; 146 143 147 144 /* prototypes */ 148 145 int nx_crypto_ctx_aes_ccm_init(struct crypto_aead *tfm);