Merge branch 'master' of git://git.denx.de/u-boot-microblaze

include/asm-microblaze/byteorder.h

@@ -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;

lib_microblaze/board.c

@@ -111,10 +111,6 @@ void board_init (void)
 	gd = (gd_t *) CONFIG_SYS_GBL_DATA_OFFSET;
 #if defined(CONFIG_CMD_FLASH)
 	ulong flash_size = 0;
-#endif
-#if defined(CONFIG_CMD_NET)
-	char *s, *e;
-	int i;
 #endif
 	asm ("nop");	/* FIXME gd is not initialize - wait */
 	memset ((void *)gd, 0, CONFIG_SYS_GBL_DATA_SIZE);