diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-20 23:14:37 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-20 23:14:37 +0100 |
| commit | e27334212c919c1e9467408da36f2cd34a8a65be (patch) | |
| tree | 72f8b6d6116e0ee7668c3159d698e9465bafbb9e /common | |
| parent | deb7282f9ff2b1946628240d0a103f2907b60147 (diff) | |
| parent | c89fd4f0a271d8f7f252266b6591be9ddee53d4e (diff) | |
| download | u-boot-e27334212c919c1e9467408da36f2cd34a8a65be.tar.gz u-boot-e27334212c919c1e9467408da36f2cd34a8a65be.tar.xz u-boot-e27334212c919c1e9467408da36f2cd34a8a65be.zip | |
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
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_pxe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 9426f5b05b..7c0cb66668 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); |