diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /arch/arm/include/asm/arch-mx7/imx-regs.h | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
| download | u-boot-WIP/19May2020.tar.gz | |
Merge branch '2020-05-18-reduce-size-of-common.h'WIP/19May2020
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'arch/arm/include/asm/arch-mx7/imx-regs.h')
| -rw-r--r-- | arch/arm/include/asm/arch-mx7/imx-regs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-mx7/imx-regs.h b/arch/arm/include/asm/arch-mx7/imx-regs.h index 6336514007..95238dcaa8 100644 --- a/arch/arm/include/asm/arch-mx7/imx-regs.h +++ b/arch/arm/include/asm/arch-mx7/imx-regs.h @@ -225,6 +225,7 @@ #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) #include <asm/mach-imx/regs-lcdif.h> #include <asm/types.h> +#include <linux/bitops.h> extern void imx_get_mac_from_fuse(int dev_id, unsigned char *mac); @@ -1223,5 +1224,5 @@ struct bootrom_sw_info { u32 reserved_3[3]; }; -#endif /* __ASSEMBLER__*/ +#endif /* __ASSEMBLY__ */ #endif /* __ASM_ARCH_MX7_IMX_REGS_H__ */ |