diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-17 10:23:56 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-17 10:23:56 +0100 |
commit | f90e136aa22ab13a3a8a321ae00e013d489a9f81 (patch) | |
tree | b79999cfa338e093cee147e2401cc4b7a709b72e /commands | |
parent | 4d63d07ffa3a6065ad67ba03209b4dbe8a0e6f94 (diff) | |
parent | 7e7ca7cb3a7ff663fc2ba5dc8ebfacdacb2b5ec4 (diff) | |
download | barebox-f90e136aa22ab13a3a8a321ae00e013d489a9f81.tar.gz barebox-f90e136aa22ab13a3a8a321ae00e013d489a9f81.tar.xz |
Merge branch 'master' into next
Diffstat (limited to 'commands')
-rw-r--r-- | commands/linux16.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/commands/linux16.c b/commands/linux16.c index ec859a73ab..5f412e29d3 100644 --- a/commands/linux16.c +++ b/commands/linux16.c @@ -150,7 +150,7 @@ struct linux_kernel_header { * (setup = 'real mode code' and kernel = 'protected mode code') to their * default locations, switches back to real mode and runs the setup code. */ -static int do_linux16(cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_linux16(struct command *cmdtp, int argc, char *argv[]) { struct linux_kernel_header *lh = NULL; int rc; |