提交 9cce5663 编写于 作者: J Joe Hershberger

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: NJoe Hershberger <joe.hershberger@ni.com>
上级 3ab75cf7
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/system.h> #include <asm/system.h>
#include <fm_eth.h>
#include <asm/armv8/mmu.h> #include <asm/armv8/mmu.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/fsl_serdes.h> #include <asm/arch/fsl_serdes.h>
...@@ -18,7 +19,6 @@ ...@@ -18,7 +19,6 @@
#include <fsl_immap.h> #include <fsl_immap.h>
#include <asm/arch/mp.h> #include <asm/arch/mp.h>
#include <efi_loader.h> #include <efi_loader.h>
#include <fm_eth.h>
#include <fsl-mc/fsl_mc.h> #include <fsl-mc/fsl_mc.h>
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC
#include <fsl_esdhc.h> #include <fsl_esdhc.h>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册