diff options
Diffstat (limited to 'arch/cris/arch-v32/drivers/axisflashmap.c')
-rw-r--r-- | arch/cris/arch-v32/drivers/axisflashmap.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c index 3ec12ea44e8e..c5ff95e18269 100644 --- a/arch/cris/arch-v32/drivers/axisflashmap.c +++ b/arch/cris/arch-v32/drivers/axisflashmap.c | |||
@@ -190,13 +190,12 @@ static struct mtd_info *probe_cs(struct map_info *map_cs) | |||
190 | "%s: Probing a 0x%08lx bytes large window at 0x%08lx.\n", | 190 | "%s: Probing a 0x%08lx bytes large window at 0x%08lx.\n", |
191 | map_cs->name, map_cs->size, map_cs->map_priv_1); | 191 | map_cs->name, map_cs->size, map_cs->map_priv_1); |
192 | 192 | ||
193 | #ifdef CONFIG_MTD_AMDSTD | ||
194 | mtd_cs = do_map_probe("amd_flash", map_cs); | ||
195 | #endif | ||
196 | #ifdef CONFIG_MTD_CFI | 193 | #ifdef CONFIG_MTD_CFI |
197 | if (!mtd_cs) { | ||
198 | mtd_cs = do_map_probe("cfi_probe", map_cs); | 194 | mtd_cs = do_map_probe("cfi_probe", map_cs); |
199 | } | 195 | #endif |
196 | #ifdef CONFIG_MTD_JEDECPROBE | ||
197 | if (!mtd_cs) | ||
198 | mtd_cs = do_map_probe("jedec_probe", map_cs); | ||
200 | #endif | 199 | #endif |
201 | 200 | ||
202 | return mtd_cs; | 201 | return mtd_cs; |