提交 a547775b 编写于 作者: S Stefan Roese

Fix conflicting types (flash_write()) in esd auto_update.c

Patch by Stefan Roese, 20 Oct 2005
上级 c4c13df2
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
Changes for U-Boot 1.1.4: 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()) * Fix problem with sleep in NetConsole (use get_timer())
Patch by Stefan Roese, 20 Oct 2005 Patch by Stefan Roese, 20 Oct 2005
......
...@@ -65,7 +65,7 @@ extern int transfer_pic(unsigned char, unsigned char *, int, int); ...@@ -65,7 +65,7 @@ extern int transfer_pic(unsigned char, unsigned char *, int, int);
#endif #endif
extern int flash_sect_erase(ulong, ulong); extern int flash_sect_erase(ulong, ulong);
extern int flash_sect_protect (int, 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 */ /* change char* to void* to shutup the compiler */
extern block_dev_desc_t *get_dev (char*, int); extern block_dev_desc_t *get_dev (char*, int);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册