浏览代码

Fix conflicting types (flash_write()) in esd auto_update.c
Patch by Stefan Roese, 20 Oct 2005

Stefan Roese 19 年之前
父节点
当前提交
a547775bac
共有 2 个文件被更改,包括 4 次插入1 次删除
  1. 3 0
      CHANGELOG
  2. 1 1
      board/esd/common/auto_update.c

+ 3 - 0
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
 

+ 1 - 1
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);