diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2018-07-16 15:33:51 -0500 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2018-07-26 14:08:21 -0500 |
| commit | 9cce5663218ed35262b66c132cd65f42d27c7825 (patch) | |
| tree | e455bc89a3eaf50b4a5568a5a00cdb6b1480c9a2 | |
| parent | 3ab75cf76e78d2ce729896625504cdfff1d3d8a5 (diff) | |
| download | u-boot-9cce5663218ed35262b66c132cd65f42d27c7825.zip u-boot-9cce5663218ed35262b66c132cd65f42d27c7825.tar.gz u-boot-9cce5663218ed35262b66c132cd65f42d27c7825.tar.bz2 | |
arm: Prevent redefinition error in fsl-layerscape
The include/phy.h will start including dm.h, which pulls in
linux/compat.h after the attempted redefinition in
arch/arm/include/asm/armv8/mmu.h, so move this include to allow
redefinition.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
| -rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 40c2c3a..052e070 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -9,6 +9,7 @@ #include <asm/io.h> #include <linux/errno.h> #include <asm/system.h> +#include <fm_eth.h> #include <asm/armv8/mmu.h> #include <asm/io.h> #include <asm/arch/fsl_serdes.h> @@ -18,7 +19,6 @@ #include <fsl_immap.h> #include <asm/arch/mp.h> #include <efi_loader.h> -#include <fm_eth.h> #include <fsl-mc/fsl_mc.h> #ifdef CONFIG_FSL_ESDHC #include <fsl_esdhc.h> |