Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-rockchip/rockchip.c between commit fc2553457ccd ("ARM:
l2c: rockchip: convert to generic l2c OF initialisation") from the arm
tree and commit 26ab69cb4c1f ("ARM: rockchip: convert smp bringup to
CPU_METHOD_OF_DECLARE") from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/mach-rockchip/rockchip.c
index 138b9975313a,4499b0a31a27..000000000000
--- a/arch/arm/mach-rockchip/rockchip.c
+++ b/arch/arm/mach-rockchip/rockchip.c
@@@ -33,8 -39,6 +33,7 @@@ static const char * const rockchip_boar
};
DT_MACHINE_START(ROCKCHIP_DT, "Rockchip Cortex-A9 (Device Tree)")
- .init_machine = rockchip_dt_init,
+ .l2c_aux_val = 0,
+ .l2c_aux_mask = ~0,
- .smp = smp_ops(rockchip_smp_ops),
.dt_compat = rockchip_board_dt_compat,
MACHINE_END
Attachment:
signature.asc
Description: PGP signature
