summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-06-07 23:41:03 +0200
committerWolfgang Denk <wd@denx.de>2012-06-07 23:41:03 +0200
commit74b5b5dbc3345a8fad4bc798f8f88d07d2ef0008 (patch)
tree474bc1734337eea4ffe7a5d64a4102185d7c0b42 /arch
parentd1c6e9e44a7218b390962e90ed462a134564676f (diff)
parentd3a105a26f89ba9f43800f9452907e01b8211da5 (diff)
downloadu-boot-imx-74b5b5dbc3345a8fad4bc798f8f88d07d2ef0008.zip
u-boot-imx-74b5b5dbc3345a8fad4bc798f8f88d07d2ef0008.tar.gz
u-boot-imx-74b5b5dbc3345a8fad4bc798f8f88d07d2ef0008.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-avr32
* 'master' of git://git.denx.de/u-boot-avr32: avr32:board.c: fix compile warning avr32:grasshopper: fix PHY initialisation Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/avr32/lib/board.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c
index b390a6c..d7a64b4 100644
--- a/arch/avr32/lib/board.c
+++ b/arch/avr32/lib/board.c
@@ -254,7 +254,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
#ifndef CONFIG_ENV_IS_NOWHERE
extern char * env_name_spec;
#endif
- char *s;
bd_t *bd;
gd = new_gd;