Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging: common/cmd_pxe.c: Fix GCC 4.6 build warnings AVR32: fix timer_init() function
This commit is contained in:
commit
c89fd4f0a2
1 changed files with 1 additions and 1 deletions
|
@ -918,7 +918,7 @@ static int parse_menu(char **c, struct pxe_menu *cfg, char *b, int nest_level)
|
|||
{
|
||||
struct token t;
|
||||
char *s = *c;
|
||||
int err;
|
||||
int err = 0;
|
||||
|
||||
get_token(c, &t, L_KEYWORD);
|
||||
|
||||
|
|
Loading…
Reference in a new issue