commit 77ddac9480d63a80b6bb76d7ee4dcc2d1070867e
author Wolfgang Denk <wd@pollux.denx.de> Thu Oct 13 16:45:02 2005 +0200
committer Wolfgang Denk <wd@pollux.denx.de> Thu Oct 13 16:45:02 2005 +0200
tree e9563b2f28ea59062b90bb5712f141e8e9798aee
parent 17a8b276ba2b3499b75cd60b0b5289dbbea7967b

Cleanup for GCC-4.x

board/ml2/flash.c

diff --git a/board/ml2/flash.c b/board/ml2/flash.c
index 4f805a6..87cb1ff 100644
--- a/board/ml2/flash.c
+++ b/board/ml2/flash.c
@@ -216,7 +216,7 @@
 	return rc;
 }
 
-volatile static int write_word (flash_info_t *info, ulong dest, unsigned long long data) {
+static int write_word (flash_info_t *info, ulong dest, unsigned long long data) {
 
 	volatile unsigned long long *addr=(unsigned long long *)dest;
 	unsigned long long result;

board/ml2/ml2.c

diff --git a/board/ml2/ml2.c b/board/ml2/ml2.c
index ff5f816..f32e512 100644
--- a/board/ml2/ml2.c
+++ b/board/ml2/ml2.c
@@ -30,8 +30,8 @@
 
 int checkboard (void)
 {
-	unsigned char *s = getenv ("serial#");
-	unsigned char *e;
+	char *s = getenv ("serial#");
+	char *e;
 
 	if (!s || strncmp (s, "ML2", 9)) {
 		printf ("### No HW ID - assuming ML2");