---

yaml --- r: 27912 b: refs/heads/master c: e369d62 h: refs/heads/master v: v3
git-mirror · May 30, 2006 · 9fff523 · 9fff523
1 parent db96e16
commit 9fff523
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1219724be193519f20743f5500bd1eff11890d0
+refs/heads/master: e369d62e92d526a7ed641e2f0b2978fb0ce366c5
diff --git a/trunk/drivers/mtd/chips/map_rom.c b/trunk/drivers/mtd/chips/map_rom.c
@@ -40,15 +40,13 @@ static struct mtd_info *map_rom_probe(struct map_info *map)
 	map->fldrv = &maprom_chipdrv;
 	mtd->priv = map;
 	mtd->name = map->name;
-	mtd->type = MTD_ROM;
+	mtd->type = MTD_GENERIC_TYPE;
 	mtd->size = map->size;
 	mtd->read = maprom_read;
 	mtd->write = maprom_write;
 	mtd->sync = maprom_nop;
 	mtd->flags = MTD_CAP_ROM;
-	mtd->erasesize = 131072;
- 	while(mtd->size & (mtd->erasesize - 1))
-		mtd->erasesize >>= 1;
+	mtd->erasesize = map->size;
 
 	__module_get(THIS_MODULE);
 	return mtd;

diff --git a/trunk/include/mtd/mtd-abi.h b/trunk/include/mtd/mtd-abi.h
@@ -25,10 +25,10 @@ struct mtd_oob_buf {
 
 #define MTD_ABSENT		0
 #define MTD_RAM			1
-#define MTD_ROM			2
 #define MTD_NORFLASH		3
 #define MTD_NANDFLASH		4
 #define MTD_DATAFLASH		6
+#define MTD_GENERIC_TYPE	7
 
 #define MTD_WRITEABLE		0x400	/* Device is writeable */
 #define MTD_BIT_WRITEABLE	0x800	/* Single bits can be flipped */