From a547775bac812f32371f1c3871bc18b40f03aaed Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Thu, 20 Oct 2005 16:39:16 +0200 Subject: Fix conflicting types (flash_write()) in esd auto_update.c Patch by Stefan Roese, 20 Oct 2005 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) (limited to 'CHANGELOG') 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 -- cgit v1.2.3