summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Lindholm <cs.helsinki.fi@shinybook.infradead.org>2004-12-13 11:47:54 +0000
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2004-12-13 11:47:54 +0000
commit4f286379cbcf82eb07530c997fffbd59bcc95a8d (patch)
tree7644a5c2d4bdc34ada0cad80952b7715536b38bf
parent89491a9b8f8549442f569145fb0c342bdf8db46d (diff)
MTD: Use JEDEC probe for flash chips on Ebony board.
Signed-off-by: Heikki O Lindholm <holindho@cs.helsinki.fi> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r--drivers/mtd/maps/Kconfig4
-rw-r--r--drivers/mtd/maps/ebony.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 6af092c5d4aa..36a3a9977b82 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -1,5 +1,5 @@
# drivers/mtd/maps/Kconfig
-# $Id: Kconfig,v 1.38 2004/11/24 19:42:51 rpurdie Exp $
+# $Id: Kconfig,v 1.39 2004/12/09 18:39:54 holindho Exp $
menu "Mapping drivers for chip access"
depends on MTD!=n
@@ -375,7 +375,7 @@ config MTD_ARCTIC
config MTD_EBONY
tristate "Flash devices mapped on IBM 440GP Ebony"
- depends on MTD_CFI && PPC32 && 44x && EBONY
+ depends on MTD_JEDECPROBE && PPC32 && 44x && EBONY
help
This enables access routines for the flash chips on the IBM 440GP
Ebony board. If you have one of these boards and would like to
diff --git a/drivers/mtd/maps/ebony.c b/drivers/mtd/maps/ebony.c
index 7f8175a6c275..b9d9cf4854b6 100644
--- a/drivers/mtd/maps/ebony.c
+++ b/drivers/mtd/maps/ebony.c
@@ -1,5 +1,5 @@
/*
- * $Id: ebony.c,v 1.14 2004/11/28 09:40:39 dwmw2 Exp $
+ * $Id: ebony.c,v 1.15 2004/12/09 18:39:54 holindho Exp $
*
* Mapping for Ebony user flash
*
@@ -103,7 +103,7 @@ int __init init_ebony(void)
simple_map_init(&ebony_small_map);
- flash = do_map_probe("map_rom", &ebony_small_map);
+ flash = do_map_probe("jedec_probe", &ebony_small_map);
if (flash) {
flash->owner = THIS_MODULE;
add_mtd_partitions(flash, ebony_small_partitions,
@@ -124,7 +124,7 @@ int __init init_ebony(void)
simple_map_init(&ebony_large_map);
- flash = do_map_probe("cfi_probe", &ebony_large_map);
+ flash = do_map_probe("jedec_probe", &ebony_large_map);
if (flash) {
flash->owner = THIS_MODULE;
add_mtd_partitions(flash, ebony_large_partitions,