mtd: parsers: Move OF parser

This moves the OF/device tree partition parser down into the
parser subdirectory. No functional change.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Richard Weinberger <richard@nod.at>

5 files changed, 11 insertions, 10 deletions

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 5a833305e4c4..4833e5b640f7 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -60,15 +60,6 @@ config MTD_CMDLINE_PARTS
 
           If unsure, say 'N'.
 
-config MTD_OF_PARTS
-        tristate "OpenFirmware partitioning information support"
-        default y
-        depends on OF
-        help
-          This provides a partition parsing function which derives
-          the partition map from the children of the flash node,
-          as described in Documentation/devicetree/bindings/mtd/partition.txt.
-
 menu "Partition parsers"
 source "drivers/mtd/parsers/Kconfig"
 endmenu
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 7b4dae4cf52d..d5f1fd696f87 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -7,7 +7,6 @@
 obj-$(CONFIG_MTD)               += mtd.o
 mtd-y                           := mtdcore.o mtdsuper.o mtdconcat.o mtdpart.o mtdchar.o
 
-obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
 obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
 obj-y                           += parsers/
 
diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig
index e356b4311d4d..2001d96cb82a 100644
--- a/drivers/mtd/parsers/Kconfig
+++ b/drivers/mtd/parsers/Kconfig
@@ -20,6 +20,16 @@ config MTD_BCM63XX_PARTS
           This provides partition parsing for BCM63xx devices with CFE
           bootloaders.
 
+config MTD_OF_PARTS
+        tristate "OpenFirmware (device tree) partitioning parser"
+        default y
+        depends on OF
+        help
+          This provides a open firmware device tree partition parser
+          which derives the partition map from the children of the
+          flash memory node, as described in
+          Documentation/devicetree/bindings/mtd/partition.txt.
+
 config MTD_PARSER_IMAGETAG
         tristate "Parser for BCM963XX Image Tag format partitions"
         depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST
diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile
index 582def540880..69b2c5289f96 100644
--- a/drivers/mtd/parsers/Makefile
+++ b/drivers/mtd/parsers/Makefile
@@ -2,6 +2,7 @@
 obj-$(CONFIG_MTD_AR7_PARTS)             += ar7part.o
 obj-$(CONFIG_MTD_BCM47XX_PARTS)         += bcm47xxpart.o
 obj-$(CONFIG_MTD_BCM63XX_PARTS)         += bcm63xxpart.o
+obj-$(CONFIG_MTD_OF_PARTS)              += ofpart.o
 obj-$(CONFIG_MTD_PARSER_IMAGETAG)       += parser_imagetag.o
 obj-$(CONFIG_MTD_AFS_PARTS)             += afs.o
 obj-$(CONFIG_MTD_PARSER_TRX)            += parser_trx.o
diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/parsers/ofpart.c
index 3caeabf27987..3caeabf27987 100644
--- a/drivers/mtd/ofpart.c
+++ b/drivers/mtd/parsers/ofpart.c