From 7d72852244c159c60d72eaadea7d4de6b43a7801 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Sun, 29 May 2011 20:16:46 +0400 Subject: [PATCH] --- yaml --- r: 274778 b: refs/heads/master c: 8d130a74e40da7dc4c572fbf0ba533fac17f4190 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/intel_vr_nor.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 56aaf17c657c..a2be69e6919b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cec25c7290d1b9d514686be97e9e62c89dd3308f +refs/heads/master: 8d130a74e40da7dc4c572fbf0ba533fac17f4190 diff --git a/trunk/drivers/mtd/maps/intel_vr_nor.c b/trunk/drivers/mtd/maps/intel_vr_nor.c index d2f47be8754b..fd612c7ec1f6 100644 --- a/trunk/drivers/mtd/maps/intel_vr_nor.c +++ b/trunk/drivers/mtd/maps/intel_vr_nor.c @@ -72,11 +72,10 @@ static void __devexit vr_nor_destroy_partitions(struct vr_nor_mtd *p) static int __devinit vr_nor_init_partitions(struct vr_nor_mtd *p) { struct mtd_partition *parts; - static const char *part_probes[] = { "cmdlinepart", NULL }; /* register the flash bank */ /* partition the flash bank */ - p->nr_parts = parse_mtd_partitions(p->info, part_probes, &parts, 0); + p->nr_parts = parse_mtd_partitions(p->info, NULL, &parts, 0); return mtd_device_register(p->info, parts, p->nr_parts); }