projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
[oweals/u-boot.git]
/
lib_nios
/
bootm.c
diff --git
a/lib_nios/bootm.c
b/lib_nios/bootm.c
index fb2e9b52050b7bfb678b9add813dc80cb95464fd..b0d5b825746217b39eb16d4593ad9494131f5123 100644
(file)
--- a/
lib_nios/bootm.c
+++ b/
lib_nios/bootm.c
@@
-28,7
+28,7
@@
* we can get this working. ;-)
*
*/
-void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
- bootm_headers_t *images)
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
{
+ return 1;
}