early_init_dt_scan() now takes care of falling back to the built-in DTB. Also make dtb_start static while we're at it. Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: Chris Zankel <chris@xxxxxxxxxx> Cc: Max Filippov <jcmvbkbc@xxxxxxxxx> Cc: linux-xtensa@xxxxxxxxxxxxxxxx --- arch/xtensa/kernel/setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index d96cf8f3fe70..dd440deb137d 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -68,7 +68,7 @@ extern int initrd_below_start_ok; #endif #ifdef CONFIG_OF -void *dtb_start = &__dtb_start; +static void *dtb_start; #endif unsigned char aux_device_present; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html