summaryrefslogtreecommitdiff
path: root/lib_nios2
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-12 16:13:12 +0200
committerWolfgang Denk <wd@denx.de>2008-09-12 16:13:12 +0200
commitafbc526336447a7357e9c82852df0377d09a8089 (patch)
tree63360d749d3f02916a1239b3862c68d41d3f3d19 /lib_nios2
parentb476b032562aae5a09985f7e22232a5ee7042746 (diff)
parentdeeec4991a55de243787002ede24d2331d234fc8 (diff)
downloadu-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.zip
u-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.tar.gz
u-boot-imx-afbc526336447a7357e9c82852df0377d09a8089.tar.bz2
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'lib_nios2')
-rw-r--r--lib_nios2/bootm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib_nios2/bootm.c b/lib_nios2/bootm.c
index c0be4fd..34f5b8f 100644
--- a/lib_nios2/bootm.c
+++ b/lib_nios2/bootm.c
@@ -35,6 +35,5 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
kernel ();
/* does not return */
-error:
return 1;
}