From 0005e34805ef8ef170a0703ad74da0fae5ee33f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Wed, 2 Sep 2015 10:41:48 +0200 Subject: [PATCH] common/board_f: add missing #endif after merge --- common/board_f.c | 1 + 1 file changed, 1 insertion(+) diff --git a/common/board_f.c b/common/board_f.c index b6a2f8c481..2ee398b93e 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -744,6 +744,7 @@ static int setup_reloc(void) gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start; #else gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE; +#endif #endif memcpy(gd->new_gd, (char *)gd, sizeof(gd_t)); -- 2.39.2