Merge branch 'master' of /home/wd/git/u-boot/custodians
* 'master' of /home/wd/git/u-boot/custodians: common/cmd_pxe.c: Fix GCC 4.6 build warnings AVR32: fix timer_init() function
This commit is contained in:
commit
e27334212c
@ -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 New Issue
Block a user