diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-03-14 16:34:35 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2021-03-14 16:34:35 +0100 |
| commit | 7868a653ebb1dda22465ec1fa86f5f5ac124687a (patch) | |
| tree | 88a0786e5ecfcbb71ea635e52f877138cc940361 /crypto/ccm.c | |
| parent | 6514ad8fef693f2033f0135707cdbd49c7874737 (diff) | |
| parent | 6bb62f2b2b65481f232042e2be2de4452e2a7bb1 (diff) | |
| download | linux-crypto-7868a653ebb1dda22465ec1fa86f5f5ac124687a.tar.gz linux-crypto-7868a653ebb1dda22465ec1fa86f5f5ac124687a.zip | |
Merge tag 'irqchip-fixes-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip fixes from Marc Zyngier:
- More compatible strings for the Ingenic irqchip (introducing the
JZ4760B SoC)
- Select GENERIC_IRQ_MULTI_HANDLER on the ARM ep93xx platform
- Drop all GENERIC_IRQ_MULTI_HANDLER selections from the irqchip
Kconfig, now relying on the architecture to get it right
- Drop the debugfs_file field from struct irq_domain, now that
debugfs can track things on its own
Diffstat (limited to 'crypto/ccm.c')
| -rw-r--r-- | crypto/ccm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/ccm.c b/crypto/ccm.c index 494d7090..6b815ece 100644 --- a/crypto/ccm.c +++ b/crypto/ccm.c @@ -6,6 +6,7 @@ */ #include <crypto/internal/aead.h> +#include <crypto/internal/cipher.h> #include <crypto/internal/hash.h> #include <crypto/internal/skcipher.h> #include <crypto/scatterwalk.h> @@ -954,3 +955,4 @@ MODULE_ALIAS_CRYPTO("ccm_base"); MODULE_ALIAS_CRYPTO("rfc4309"); MODULE_ALIAS_CRYPTO("ccm"); MODULE_ALIAS_CRYPTO("cbcmac"); +MODULE_IMPORT_NS(CRYPTO_INTERNAL); |