summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.(none)>2005-09-25 17:02:27 +0200
committerWolfgang Denk <wd@pollux.(none)>2005-09-25 17:02:27 +0200
commit31466294b0c4ff372288229b0997de51f8ecaf3f (patch)
treed8a70736615e7e0ee37a3fbc0a8a06b4dcc6b00e
parentb66eb5282d568225abad5b3b61cc0968be35fc0d (diff)
Remove unneeded #include <malloc.h>
Patch by Ladislav Michl, 22 Feb 2005
-rw-r--r--CHANGELOG3
-rw-r--r--common/env_dataflash.c1
-rw-r--r--common/env_eeprom.c1
-rw-r--r--common/env_nand.c1
-rw-r--r--common/env_nowhere.c1
-rw-r--r--common/env_nvram.c1
-rw-r--r--common/main.c1
7 files changed, 3 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7009ce74b6..659c956bfc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes for U-Boot 1.1.4:
======================================================================
+* Remove unneeded #include <malloc.h>
+ Patch by Ladislav Michl, 22 Feb 2005
+
* Add cramfs support for m68k
Patch by Zachary Landau, 21 Feb 2005
diff --git a/common/env_dataflash.c b/common/env_dataflash.c
index 8bfbbc943e..8834da032b 100644
--- a/common/env_dataflash.c
+++ b/common/env_dataflash.c
@@ -24,7 +24,6 @@
#include <command.h>
#include <environment.h>
#include <linux/stddef.h>
-#include <malloc.h>
#include <dataflash.h>
env_t *env_ptr = NULL;
diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index 300af6fcfe..50c623e37e 100644
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -31,7 +31,6 @@
#include <command.h>
#include <environment.h>
#include <linux/stddef.h>
-#include <malloc.h>
env_t *env_ptr = NULL;
diff --git a/common/env_nand.c b/common/env_nand.c
index 516aed7326..60aba1e7e6 100644
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -36,7 +36,6 @@
#include <command.h>
#include <environment.h>
#include <linux/stddef.h>
-#include <malloc.h>
#include <linux/mtd/nand.h>
#if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_NAND)) == (CFG_CMD_ENV|CFG_CMD_NAND))
diff --git a/common/env_nowhere.c b/common/env_nowhere.c
index b274c03557..ee4237c7e9 100644
--- a/common/env_nowhere.c
+++ b/common/env_nowhere.c
@@ -31,7 +31,6 @@
#include <command.h>
#include <environment.h>
#include <linux/stddef.h>
-#include <malloc.h>
env_t *env_ptr = NULL;
diff --git a/common/env_nvram.c b/common/env_nvram.c
index 2c831d14d7..a406e427a2 100644
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -47,7 +47,6 @@
#include <command.h>
#include <environment.h>
#include <linux/stddef.h>
-#include <malloc.h>
#ifdef CFG_NVRAM_ACCESS_ROUTINE
extern void *nvram_read(void *dest, const long src, size_t count);
diff --git a/common/main.c b/common/main.c
index 9f649dbcd3..29226244a1 100644
--- a/common/main.c
+++ b/common/main.c
@@ -26,7 +26,6 @@
#include <common.h>
#include <watchdog.h>
#include <command.h>
-#include <malloc.h>
#ifdef CFG_HUSH_PARSER
#include <hush.h>