diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-06 10:25:04 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-06 10:25:04 +0200 |
| commit | e6c03f01bf7da74f4d846efb3e014f053ace92bd (patch) | |
| tree | f73fef831bf2bb7dcc1a27413e5857161d385d8b /commands | |
| parent | 6d00046884f79e53b87c1c7dfb09dc992036a396 (diff) | |
| parent | ed66bf27876d13b69000d1e63b2fadf6c0e0b231 (diff) | |
| download | barebox-e6c03f01bf7da74f4d846efb3e014f053ace92bd.tar.gz barebox-e6c03f01bf7da74f4d846efb3e014f053ace92bd.tar.xz | |
Merge branch 'next'
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/bootm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/commands/bootm.c b/commands/bootm.c index 34164bcf08..e5ffacb022 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"); |