diff --git a/[refs] b/[refs] index a348ef638f5f..56aaf17c657c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3af035c96ac72d2d301f04ad7f253e342a7dc54b +refs/heads/master: cec25c7290d1b9d514686be97e9e62c89dd3308f diff --git a/trunk/drivers/mtd/maps/impa7.c b/trunk/drivers/mtd/maps/impa7.c index 404a50cbafa0..2d45a489622e 100644 --- a/trunk/drivers/mtd/maps/impa7.c +++ b/trunk/drivers/mtd/maps/impa7.c @@ -61,7 +61,6 @@ static struct mtd_partition static_partitions[] = static int mtd_parts_nb[NUM_FLASHBANKS]; static struct mtd_partition *mtd_parts[NUM_FLASHBANKS]; -static const char *probes[] = { "cmdlinepart", NULL }; static int __init init_impa7(void) { @@ -98,7 +97,7 @@ static int __init init_impa7(void) impa7_mtd[i]->owner = THIS_MODULE; devicesfound++; mtd_parts_nb[i] = parse_mtd_partitions(impa7_mtd[i], - probes, + NULL, &mtd_parts[i], 0); if (mtd_parts_nb[i] > 0) {