diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
| commit | 1c4b5038afcc7cdb1064713f65571da05aa0de0e (patch) | |
| tree | bbb554b1128dc15453a91fc50408446da2e0ddd2 /arch/arm/cpu/armv7/ls102xa/cpu.c | |
| parent | 7c3cc6f106ed1ca13b0ff6eea9f8e1473240aef3 (diff) | |
| parent | 21fc5a16855602b2fd4b39e40679f854101a0fa3 (diff) | |
Merge branch '2020-07-17-misc-fixes'
A large number of assorted fixes, including but not limited to:
- Correct fixdep and CONFIG_IS_ENABLED(...)
- lz4 on big endian
- Assorted LMB hardening
- Remove bd_t typedef
Diffstat (limited to 'arch/arm/cpu/armv7/ls102xa/cpu.c')
| -rw-r--r-- | arch/arm/cpu/armv7/ls102xa/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index 91e988217a..ce472aa9bd 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -293,13 +293,13 @@ int print_cpuinfo(void) #endif #ifdef CONFIG_FSL_ESDHC -int cpu_mmc_init(bd_t *bis) +int cpu_mmc_init(struct bd_info *bis) { return fsl_esdhc_mmc_init(bis); } #endif -int cpu_eth_init(bd_t *bis) +int cpu_eth_init(struct bd_info *bis) { #if defined(CONFIG_TSEC_ENET) && !defined(CONFIG_DM_ETH) tsec_standard_init(bis); |