diff --git a/CHANGELOG b/CHANGELOG
index a063a01db9db1544b34f1ad7021f0c5d49018b46..a97b24d7400d1951038b51eadc5c6cf09ee45734 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 1dceb3affbb2fe0d0232d258dd1634203ea370c3..d48e97286669030b4c1a02879066e16bc7f0be59 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);