Commit f889cedf authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

Merge branch 'master' of git://

parents 569460eb 292ed489
......@@ -27,7 +27,9 @@
I think this is a symptom of a bug in mb-gcc. JW 20040303
static __inline__ __const__ __u16 ___arch__swab16 (__u16 half_word)
static __inline__ __u16 ___arch__swab16 (__u16 half_word)
/* 32 bit temp to cast result, forcing clearing of high word */
__u32 temp;
......@@ -111,10 +111,6 @@ void board_init (void)
#if defined(CONFIG_CMD_FLASH)
ulong flash_size = 0;
#if defined(CONFIG_CMD_NET)
char *s, *e;
int i;
asm ("nop"); /* FIXME gd is not initialize - wait */
memset ((void *)gd, 0, CONFIG_SYS_GBL_DATA_SIZE);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment