summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--common/main.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f5a16d8825..24a43cba07 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 29226244a1..1389958de3 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>