From: Wolfgang Denk <wd@pollux.denx.de>
Date: Fri, 30 Sep 2005 13:18:23 +0000 (+0200)
Subject: Fix compiler warning
X-Git-Tag: LABEL_2006_03_12_0025~125
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9631ecf528b0f89d2ffda693209b088411434d0;p=pandora-u-boot.git

Fix compiler warning
---

diff --git a/CHANGELOG b/CHANGELOG
index f5a16d8825b..24a43cba070 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fix compiler warning
+
 * Fix FEC PHY addresses for TQM85xx boards
 
 * Fix uninitialized variable problem in hush shell
diff --git a/common/main.c b/common/main.c
index 29226244a1a..1389958de3e 100644
--- a/common/main.c
+++ b/common/main.c
@@ -26,6 +26,9 @@
 #include <common.h>
 #include <watchdog.h>
 #include <command.h>
+#ifdef CONFIG_MODEM_SUPPORT
+#include <malloc.h>		/* for free() prototype */
+#endif
 
 #ifdef CFG_HUSH_PARSER
 #include <hush.h>