mtd/maps: uclinux: fix building when partition support is disabled

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 <tim@ipi.ac.ru>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
CC: Greg Ungerer <gerg@uclinux.org>
CC: uclinux-dev@uclinux.org
CC: linux-mtd@lists.infradead.org
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index d4314fb8821219c78279599a8113efab68f76b4f..35009294b435f33a62c0dbb4496ffe5c8b189174 100644 (file)
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -89,7 +89,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);
 }
@@ -99,7 +103,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;
        }