summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-12-20 23:14:32 +0100
committerWolfgang Denk <wd@denx.de>2011-12-20 23:14:32 +0100
commitc89fd4f0a271d8f7f252266b6591be9ddee53d4e (patch)
tree6788cca96b28fc173b3f1aaa8622ca4dbf15e7dd /common
parentbf0b6313433819899c49d8d6fb30b4d702226f1e (diff)
parent43d4a5e687fe530d641227910d5e8f1514228eff (diff)
downloadu-boot-imx-c89fd4f0a271d8f7f252266b6591be9ddee53d4e.zip
u-boot-imx-c89fd4f0a271d8f7f252266b6591be9ddee53d4e.tar.gz
u-boot-imx-c89fd4f0a271d8f7f252266b6591be9ddee53d4e.tar.bz2
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
Diffstat (limited to 'common')
-rw-r--r--common/cmd_pxe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
index 9426f5b..7c0cb66 100644
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -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);