Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 09:34:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Timofei Bondarenko 2009-05-20 19:59:02 -04:00 committed by David Woodhouse
parent 9aff1b1afe
commit 3ff230a742
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mtd/maps/uclinux.c
View File

@ -89,7 +89,11 @@ static int __init uclinux_mtd_init(void)
mtd->priv = mapp; mtd->priv = mapp;
uclinux_ram_mtdinfo = mtd; uclinux_ram_mtdinfo = mtd;
#ifdef CONFIG_MTD_PARTITIONS
add_mtd_partitions(mtd, uclinux_romfs, NUM_PARTITIONS); add_mtd_partitions(mtd, uclinux_romfs, NUM_PARTITIONS);
#else
add_mtd_device(mtd);
#endif
return(0); return(0);
} }
@ -99,7 +103,11 @@ static int __init uclinux_mtd_init(void)
static void __exit uclinux_mtd_cleanup(void) static void __exit uclinux_mtd_cleanup(void)
{ {
if (uclinux_ram_mtdinfo) { if (uclinux_ram_mtdinfo) {
#ifdef CONFIG_MTD_PARTITIONS
del_mtd_partitions(uclinux_ram_mtdinfo); del_mtd_partitions(uclinux_ram_mtdinfo);
#else
del_mtd_device(uclinux_ram_mtdinfo);
#endif
map_destroy(uclinux_ram_mtdinfo); map_destroy(uclinux_ram_mtdinfo);
uclinux_ram_mtdinfo = NULL; uclinux_ram_mtdinfo = NULL;
} }