All applied to -next
Sascha
On Mon, Jul 04, 2011 at 12:53:01AM +0400, Antony Pavlov wrote:
> ---
> commands/bootm.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/commands/bootm.c b/commands/bootm.c
> index 34164bc..e5ffacb 100644
> --- a/commands/bootm.c
> +++ b/commands/bootm.c
> @@ -282,7 +282,6 @@ static int handler_parse_options(struct image_data *data, int opt, char *optarg)
>
> static int do_bootm(struct command *cmdtp, int argc, char *argv[])
> {
> - ulong iflag;
> int opt;
> image_header_t *os_header;
> struct image_handle *os_handle, *initrd_handle = NULL;
> @@ -344,7 +343,7 @@ static int do_bootm(struct command *cmdtp, int argc, char *argv[])
> * recover from any failures any more...
> */
>
> - iflag = disable_interrupts();
> + disable_interrupts();
>
> puts ("OK\n");
>
> --
> 1.7.5.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
