diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-26 00:12:56 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-26 00:12:56 -0700 |
| commit | 1ca8c0a763418d7f15f5d1d13c3005b6d3a083db (patch) | |
| tree | 0072c1d2c7c9986fac133d2dcff096be9810e273 /drivers/crypto | |
| parent | 92f06c384b4950d1fc9e7177dd722a45c28a07f9 (diff) | |
| parent | 4625210899095195600062ff8542f37a1c9f5dd4 (diff) | |
| download | linux-1ca8c0a763418d7f15f5d1d13c3005b6d3a083db.tar.gz linux-1ca8c0a763418d7f15f5d1d13c3005b6d3a083db.tar.bz2 linux-1ca8c0a763418d7f15f5d1d13c3005b6d3a083db.zip | |
Merge tag 'soc-fsl-for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into next/drivers
Various updates to soc/fsl for 4.19
Moves DPAA2 DPIO driver from staging to fsl/soc
Adds multiple-pin support to QE gpio driver
* tag 'soc-fsl-for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux:
soc: fsl: cleanup Kconfig menu
soc: fsl: dpio: Convert DPIO documentation to .rst
staging: fsl-mc: Remove remaining files
staging: fsl-mc: Move DPIO from staging to drivers/soc/fsl
staging: fsl-dpaa2: eth: move generic FD defines to DPIO
soc: fsl: qe: gpio: Add qe_gpio_set_multiple
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/caam/sg_sw_qm2.h | 2 | ||||
| -rw-r--r-- | drivers/crypto/caam/sg_sw_sec4.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/caam/sg_sw_qm2.h b/drivers/crypto/caam/sg_sw_qm2.h index 31b440757146..b5b4c12179df 100644 --- a/drivers/crypto/caam/sg_sw_qm2.h +++ b/drivers/crypto/caam/sg_sw_qm2.h @@ -35,7 +35,7 @@ #ifndef _SG_SW_QM2_H_ #define _SG_SW_QM2_H_ -#include "../../../drivers/staging/fsl-mc/include/dpaa2-fd.h" +#include <soc/fsl/dpaa2-fd.h> static inline void dma_to_qm_sg_one(struct dpaa2_sg_entry *qm_sg_ptr, dma_addr_t dma, u32 len, u16 offset) diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_sec4.h index e586ffab8358..dbfa9fce33e0 100644 --- a/drivers/crypto/caam/sg_sw_sec4.h +++ b/drivers/crypto/caam/sg_sw_sec4.h @@ -12,7 +12,7 @@ #include "ctrl.h" #include "regs.h" #include "sg_sw_qm2.h" -#include "../../../drivers/staging/fsl-mc/include/dpaa2-fd.h" +#include <soc/fsl/dpaa2-fd.h> struct sec4_sg_entry { u64 ptr; |