diff options
Diffstat (limited to 'arch/cris/arch-v10/drivers/axisflashmap.c')
-rw-r--r-- | arch/cris/arch-v10/drivers/axisflashmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c index efd7b0f3a910..ea3cf2e39a14 100644 --- a/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/arch/cris/arch-v10/drivers/axisflashmap.c | |||
@@ -312,12 +312,12 @@ static struct mtd_info *probe_cs(struct map_info *map_cs) | |||
312 | "%s: Probing a 0x%08lx bytes large window at 0x%08lx.\n", | 312 | "%s: Probing a 0x%08lx bytes large window at 0x%08lx.\n", |
313 | map_cs->name, map_cs->size, map_cs->map_priv_1); | 313 | map_cs->name, map_cs->size, map_cs->map_priv_1); |
314 | 314 | ||
315 | #ifdef CONFIG_MTD_AMDSTD | ||
316 | mtd_cs = do_map_probe("amd_flash", map_cs); | ||
317 | #endif | ||
318 | #ifdef CONFIG_MTD_CFI | 315 | #ifdef CONFIG_MTD_CFI |
316 | mtd_cs = do_map_probe("cfi_probe", map_cs); | ||
317 | #endif | ||
318 | #ifdef CONFIG_MTD_JEDECPROBE | ||
319 | if (!mtd_cs) { | 319 | if (!mtd_cs) { |
320 | mtd_cs = do_map_probe("cfi_probe", map_cs); | 320 | mtd_cs = do_map_probe("jedec_probe", map_cs); |
321 | } | 321 | } |
322 | #endif | 322 | #endif |
323 | 323 | ||