From: Stefan Roese Date: Thu, 20 Oct 2005 14:39:16 +0000 (+0200) Subject: Fix conflicting types (flash_write()) in esd auto_update.c X-Git-Tag: LABEL_2006_03_12_0025~83^2~1 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a547775bac812f32371f1c3871bc18b40f03aaed;p=u-boot Fix conflicting types (flash_write()) in esd auto_update.c Patch by Stefan Roese, 20 Oct 2005 --- diff --git a/CHANGELOG b/CHANGELOG index a063a01db9..a97b24d740 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 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);