diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-01 17:25:59 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-01 17:25:59 +0100 |
| commit | 6cbf70a01a0d40280acc2eb32508327d00317476 (patch) | |
| tree | 316581a993ea6e9b7b581290c5feb61c9cbf3eb2 /arch/arm/lib | |
| parent | e4ee34a829a00e058828f3daade04f4141ea3ef9 (diff) | |
| parent | 7d3da14a7e187d05ee42fb7e628fb4091207b5e3 (diff) | |
| download | barebox-6cbf70a01a0d40280acc2eb32508327d00317476.tar.gz barebox-6cbf70a01a0d40280acc2eb32508327d00317476.tar.xz | |
Merge branch 'pu'
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/armlinux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/armlinux.c b/arch/arm/lib/armlinux.c index 25b7744b91..2415c29bc7 100644 --- a/arch/arm/lib/armlinux.c +++ b/arch/arm/lib/armlinux.c @@ -235,7 +235,7 @@ struct zimage_header { u32 end; }; -static int do_bootz(cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_bootz(struct command *cmdtp, int argc, char *argv[]) { void (*theKernel)(int zero, int arch, void *params); const char *commandline = getenv("bootargs"); @@ -308,7 +308,7 @@ BAREBOX_CMD_END #endif /* CONFIG_CMD_BOOTZ */ #ifdef CONFIG_CMD_BOOTU -static int do_bootu(cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_bootu(struct command *cmdtp, int argc, char *argv[]) { void (*theKernel)(int zero, int arch, void *params); const char *commandline = getenv("bootargs"); |