Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi Stephen,
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/mach-exynos/exynos.c between commit 46bfc99c9225 ("ARM: l2c:
> exynos: convert to generic l2c OF initialisation (and thereby fix it)")
> from the arm tree and commit 3919fb954b3a ("ARM: EXYNOS: Remove
> exynos_subsys registration") from the samsung tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Looks good to me, thanks.
- Kukjin
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc arch/arm/mach-exynos/exynos.c
> index afce154f83f9,93507ee98c86..000000000000
> --- a/arch/arm/mach-exynos/exynos.c
> +++ b/arch/arm/mach-exynos/exynos.c
> @@@ -241,17 -246,22 +243,6 @@@ void __init exynos_init_io(void
> exynos_map_io();
> }
>
> - struct bus_type exynos_subsys = {
> - .name = "exynos-core",
> - .dev_name = "exynos-core",
> - };
> -
> - static int __init exynos_core_init(void)
> -static int __init exynos4_l2x0_cache_init(void)
> --{
> - return subsys_system_register(&exynos_subsys, NULL);
> - int ret;
> -
> - ret = l2x0_of_init(L2_AUX_VAL, L2_AUX_MASK);
> - if (ret)
> - return ret;
> -
> - if (IS_ENABLED(CONFIG_S5P_SLEEP)) {
> - l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);
> - clean_dcache_area(&l2x0_regs_phys, sizeof(unsigned long));
> - }
> - return 0;
> --}
> - core_initcall(exynos_core_init);
> -early_initcall(exynos4_l2x0_cache_init);
> --
> static void __init exynos_dt_machine_init(void)
> {
> struct device_node *i2c_np;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
