diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-13 16:45:02 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-13 16:45:02 +0200 |
| commit | 77ddac9480d63a80b6bb76d7ee4dcc2d1070867e (patch) | |
| tree | e9563b2f28ea59062b90bb5712f141e8e9798aee /board/ml2 | |
| parent | 17a8b276ba2b3499b75cd60b0b5289dbbea7967b (diff) | |
| download | blackbird-obmc-uboot-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.tar.gz blackbird-obmc-uboot-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.zip | |
Cleanup for GCC-4.x
Diffstat (limited to 'board/ml2')
| -rw-r--r-- | board/ml2/flash.c | 2 | ||||
| -rw-r--r-- | board/ml2/ml2.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/board/ml2/flash.c b/board/ml2/flash.c index 4f805a663b..87cb1ff18e 100644 --- a/board/ml2/flash.c +++ b/board/ml2/flash.c @@ -216,7 +216,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) { 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; diff --git a/board/ml2/ml2.c b/board/ml2/ml2.c index ff5f816796..f32e512d4f 100644 --- a/board/ml2/ml2.c +++ b/board/ml2/ml2.c @@ -30,8 +30,8 @@ int board_early_init_f (void) 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"); |
