| Message ID | 1243331191-11445-1-git-send-email-vapier@gentoo.org |
|---|---|
| State | Accepted |
| Commit | 3ff230a742b8fc196c1fe69875a57a429877cacb |
| Headers | show |
Mike Frysinger wrote: > From: Timofei Bondarenko <tim@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 <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> Acked-by: Greg Ungerer <gerg@uclinux.org> > CC: uclinux-dev@uclinux.org > CC: linux-mtd@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; > }
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; }