Mike Frysinger wrote:
From: Timofei Bondarenko <t...@ipi.ac.ru>

The uClinux map driver doesn't even use partitions, so we shouldn't require
it in order to work properly.

Signed-off-by: Timofei Bondarenko <t...@ipi.ac.ru>
Signed-off-by: Mike Frysinger <vap...@gentoo.org>
Signed-off-by: Sonic Zhang <sonic.zh...@analog.com>
CC: Greg Ungerer <g...@uclinux.org>

Acked-by: Greg Ungerer <g...@uclinux.org>


CC: uclinux-dev@uclinux.org
CC: linux-...@lists.infradead.org
---
 drivers/mtd/maps/uclinux.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index 81756e3..57699c2 100644
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -87,7 +87,11 @@ static int __init uclinux_mtd_init(void)
        mtd->priv = mapp;
uclinux_ram_mtdinfo = mtd;
+#ifdef CONFIG_MTD_PARTITIONS
        add_mtd_partitions(mtd, uclinux_romfs, NUM_PARTITIONS);
+#else
+       add_mtd_device(mtd);
+#endif
return(0);
 }
@@ -97,7 +101,11 @@ static int __init uclinux_mtd_init(void)
 static void __exit uclinux_mtd_cleanup(void)
 {
        if (uclinux_ram_mtdinfo) {
+#ifdef CONFIG_MTD_PARTITIONS
                del_mtd_partitions(uclinux_ram_mtdinfo);
+#else
+               del_mtd_device(uclinux_ram_mtdinfo);
+#endif
                map_destroy(uclinux_ram_mtdinfo);
                uclinux_ram_mtdinfo = NULL;
        }

--
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     g...@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com
_______________________________________________
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev

Reply via email to