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/mach-imx/sys_proto.h | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'arch/arm/include/asm/mach-imx/sys_proto.h')
| -rw-r--r-- | arch/arm/include/asm/mach-imx/sys_proto.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index 927195f87ac..0bc705df172 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -10,9 +10,11 @@ #include <asm/io.h> #include <asm/mach-imx/regs-common.h> #include <asm/mach-imx/module_fuse.h> -#include <common.h> +#include <linux/bitops.h> #include "../arch-imx/cpu.h" +struct bd_info; + #define soc_rev() (get_cpu_rev() & 0xFF) #define is_soc_rev(rev) (soc_rev() == rev) @@ -182,7 +184,7 @@ char nxp_board_rev_string(void); * Initializes on-chip ethernet controllers. * to override, implement board_eth_init() */ -int fecmxc_initialize(bd_t *bis); +int fecmxc_initialize(struct bd_info *bis); u32 get_ahb_clk(void); u32 get_periph_clk(void); |