summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Jarzmik <robert.jarzmik@free.fr>2011-12-21 22:30:38 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-12-22 10:11:11 +0100
commit8ccde79470ac8f6c45c169ab0f11a3f3f93ffcc9 (patch)
tree1ff35cd89b804cd9c350acfd06404d262fd2d810
parent3fada2bcedf668f9d2eca1971bb8a225dc03f645 (diff)
downloadbarebox-8ccde79470ac8f6c45c169ab0f11a3f3f93ffcc9.tar.gz
barebox-8ccde79470ac8f6c45c169ab0f11a3f3f93ffcc9.tar.xz
drivers/mtd: move nand.c into core.c
Move nand core into the global MTD core. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/mtd/Makefile1
-rw-r--r--drivers/mtd/core.c (renamed from drivers/mtd/nand/nand.c)0
-rw-r--r--drivers/mtd/nand/Makefile2
3 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 85bed11745..80fe38628c 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -1,3 +1,4 @@
obj-$(CONFIG_NAND) += nand/
obj-$(CONFIG_UBI) += ubi/
obj-$(CONFIG_PARTITION_NEED_MTD) += partition.o
+obj-$(CONFIG_MTD) += core.o
diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/core.c
index 130e2af3be..130e2af3be 100644
--- a/drivers/mtd/nand/nand.c
+++ b/drivers/mtd/core.c
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 149cbbfa22..26b65a7dc5 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -1,6 +1,6 @@
# Generic NAND options
-obj-$(CONFIG_NAND) += nand.o nand_ecc.o
+obj-$(CONFIG_NAND) += nand_ecc.o
obj-$(CONFIG_NAND_WRITE) += nand_write.o
obj-$(CONFIG_NAND_ECC_SOFT) += nand_ecc.o nand_swecc.o
obj-$(CONFIG_NAND_ECC_HW) += nand_hwecc.o