summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2012-04-03 13:27:00 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-10 11:24:07 +0200
commitf8856d422ecdfe1609a8c2c78153ca68b4dae7a1 (patch)
tree490bf88c46f6e16b9c6459aa3b75677b3da786e6
parent705a2e2e259e8cb448ca7ec5a0c80b7487980113 (diff)
downloadbarebox-f8856d422ecdfe1609a8c2c78153ca68b4dae7a1.tar.gz
barebox-f8856d422ecdfe1609a8c2c78153ca68b4dae7a1.tar.xz
Define barebox_loc magic variable only once
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-imx/boot.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index 9f2def6b2b..b79ebc7406 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -87,8 +87,6 @@ static int imx_25_35_boot_save_loc(void)
return 0;
}
coredevice_initcall(imx_25_35_boot_save_loc);
-
-BAREBOX_MAGICVAR(barebox_loc, "The source barebox has been booted from");
#endif
#if defined(CONFIG_ARCH_IMX27)
@@ -114,6 +112,6 @@ static int imx_27_boot_save_loc(void)
return 0;
}
coredevice_initcall(imx_27_boot_save_loc);
+#endif
BAREBOX_MAGICVAR(barebox_loc, "The source barebox has been booted from");
-#endif