summaryrefslogtreecommitdiffstats
path: root/common/Makefile
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2007-11-27 20:35:04 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2007-11-27 23:19:55 +0100
commite68ac6368d8fe654b015f221c9cb179c0c4723e0 (patch)
treea32bcce0bc2a56ff7510495da12876ddb651a8a3 /common/Makefile
parent397274e04f8702a4b5524d0c0167bb2f887f077f (diff)
downloadbarebox-e68ac6368d8fe654b015f221c9cb179c0c4723e0.tar.gz
barebox-e68ac6368d8fe654b015f221c9cb179c0c4723e0.tar.xz
Revert "separating memory commands"
This reverts commit d59c600c656d08410ea862c582fbd77432c3ca47. Conflicts: commands/Makefile common/Kconfig common/Makefile Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'common/Makefile')
-rw-r--r--common/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile
index d06e1a6134..25128b1653 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -4,7 +4,6 @@ obj-$(CONFIG_GREGORIAN_CALENDER) += date.o
obj-$(CONFIG_OF_FLAT_TREE) += ft_build.o
obj-$(CONFIG_MODULE) += module.o
obj-$(CONFIG_KALLSYMS) += kallsyms.o
-obj-$(CONFIG_CMD_MEMORY) += mem.o
obj-$(CONFIG_ENV_HANDLING) += environment.o
obj-y += dlmalloc.o