diff options
| author | Stefan Roese <sr@denx.de> | 2005-10-20 16:39:16 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2005-10-20 16:39:16 +0200 |
| commit | a547775bac812f32371f1c3871bc18b40f03aaed (patch) | |
| tree | fae83daa76b3ccf4e38f0e68d78baa54af24c007 | |
| parent | c4c13df284cb06156c16ee6aef49b8d23be3fadd (diff) | |
Fix conflicting types (flash_write()) in esd auto_update.c
Patch by Stefan Roese, 20 Oct 2005
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | board/esd/common/auto_update.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index a063a01db9d..a97b24d7400 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 1dceb3affbb..d48e9728666 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); |