move drivers/nand to drivers/mtd/nand

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

18 files changed, 12 insertions, 3 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index bf559c4054..ae9efce379 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -5,7 +5,7 @@ source "drivers/net/Kconfig"
 source "drivers/spi/Kconfig"
 source "drivers/i2c/Kconfig"
 source "drivers/nor/Kconfig"
-source "drivers/nand/Kconfig"
+source "drivers/mtd/Kconfig"
 source "drivers/ata/Kconfig"
 source "drivers/usb/Kconfig"
 source "drivers/video/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 7bae6ffcb6..bce68bc7b5 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,6 +1,6 @@
 obj-y	+= net/
 obj-y	+= serial/
-obj-y	+= nand/
+obj-y	+= mtd/
 obj-y	+= nor/
 obj-y	+= usb/
 obj-$(CONFIG_ATA) += ata/
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
new file mode 100644
index 0000000000..53183fc4dd
--- /dev/null
+++ b/drivers/mtd/Kconfig
@@ -0,0 +1,8 @@
+menuconfig MTD
+        bool "Memory Technology Device (MTD) support"
+
+if MTD
+
+source "drivers/mtd/nand/Kconfig"
+
+endif
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
new file mode 100644
index 0000000000..87ee6f45d3
--- /dev/null
+++ b/drivers/mtd/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_NAND)	+= nand/
diff --git a/drivers/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 031b94d4e5..e0d9d0d3b6 100644
--- a/drivers/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -1,5 +1,5 @@
 menuconfig NAND
-	bool "NAND support                  "
+	bool "NAND support              "
 	select MTD_NAND_IDS
 	help
 	  This enables support for accessing all type of NAND flash
diff --git a/drivers/nand/Makefile b/drivers/mtd/nand/Makefile
index 73f734688e..73f734688e 100644
--- a/drivers/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
diff --git a/drivers/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index c3669e5a31..c3669e5a31 100644
--- a/drivers/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
diff --git a/drivers/nand/atmel_nand_ecc.h b/drivers/mtd/nand/atmel_nand_ecc.h
index 578c776e13..578c776e13 100644
--- a/drivers/nand/atmel_nand_ecc.h
+++ b/drivers/mtd/nand/atmel_nand_ecc.h
diff --git a/drivers/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index e762524540..e762524540 100644
--- a/drivers/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
diff --git a/drivers/nand/nand.c b/drivers/mtd/nand/nand.c
index 4927231c17..4927231c17 100644
--- a/drivers/nand/nand.c
+++ b/drivers/mtd/nand/nand.c
diff --git a/drivers/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index b75a450278..b75a450278 100644
--- a/drivers/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
diff --git a/drivers/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 4a6bf390a4..4a6bf390a4 100644
--- a/drivers/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
diff --git a/drivers/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index 266d57318b..266d57318b 100644
--- a/drivers/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
diff --git a/drivers/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index f95975c9ea..f95975c9ea 100644
--- a/drivers/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
diff --git a/drivers/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c
index 74cdf10a50..74cdf10a50 100644
--- a/drivers/nand/nand_imx.c
+++ b/drivers/mtd/nand/nand_imx.c
diff --git a/drivers/nand/nand_omap_gpmc.c b/drivers/mtd/nand/nand_omap_gpmc.c
index c6647e56ed..c6647e56ed 100644
--- a/drivers/nand/nand_omap_gpmc.c
+++ b/drivers/mtd/nand/nand_omap_gpmc.c
diff --git a/drivers/nand/nand_s3c2410.c b/drivers/mtd/nand/nand_s3c2410.c
index b989583050..b989583050 100644
--- a/drivers/nand/nand_s3c2410.c
+++ b/drivers/mtd/nand/nand_s3c2410.c
diff --git a/drivers/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index d57294e624..d57294e624 100644
--- a/drivers/nand/nand_util.c
+++ b/drivers/mtd/nand/nand_util.c