---

yaml --- r: 274880 b: refs/heads/master c: 73f36b3 h: refs/heads/master v: v3
git-mirror · Sep 11, 2011 · 44366ce · 44366ce
1 parent 3cf0aa4
commit 44366ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99add4228fce515fe113282147a0aab74afa29ae
+refs/heads/master: 73f36b3e251888ef224a3c90d3c408e02a1eb957
diff --git a/trunk/drivers/mtd/nand/fsl_upm.c b/trunk/drivers/mtd/nand/fsl_upm.c
@@ -193,9 +193,7 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
 		goto err;
 
 	ppdata.of_node = flash_np;
-	ret = parse_mtd_partitions(&fun->mtd, NULL, &fun->parts, &ppdata);
-
-	ret = mtd_device_register(&fun->mtd, fun->parts, ret);
+	ret = mtd_device_parse_register(&fun->mtd, NULL, &ppdata, NULL, 0);
 err:
 	of_node_put(flash_np);
 	return ret;