diff options
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | board/esd/common/auto_update.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -2,6 +2,9 @@ Changes for U-Boot 1.1.4: ====================================================================== +* Fix conflicting types (flash_write()) in esd auto_update.c + Patch by Stefan Roese, 20 Oct 2005 + * Fix problem with sleep in NetConsole (use get_timer()) Patch by Stefan Roese, 20 Oct 2005 diff --git a/board/esd/common/auto_update.c b/board/esd/common/auto_update.c index 1dceb3affb..d48e972866 100644 --- a/board/esd/common/auto_update.c +++ b/board/esd/common/auto_update.c @@ -65,7 +65,7 @@ extern int transfer_pic(unsigned char, unsigned char *, int, int); #endif extern int flash_sect_erase(ulong, ulong); extern int flash_sect_protect (int, ulong, ulong); -extern int flash_write (uchar *, ulong, ulong); +extern int flash_write (char *, ulong, ulong); /* change char* to void* to shutup the compiler */ extern block_dev_desc_t *get_dev (char*, int); |