---

yaml
---
r: 274795
b: refs/heads/master
c: 4ac6b3e
h: refs/heads/master
i:
  274793: f0cc422
  274791: 88e8424
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f397d8c074c966f61b12c4c554e0aa32704056c7
+refs/heads/master: 4ac6b3ef7191c508a356c205b02ab82f5e228d0c

trunk/drivers/mtd/nand/orion_nand.c

@@ -21,8 +21,6 @@
 #include <mach/hardware.h>
 #include <plat/orion_nand.h>
 
-static const char *part_probes[] = { "cmdlinepart", NULL };
-
 static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 {
 	struct nand_chip *nc = mtd->priv;
@@ -132,10 +130,8 @@ static int __init orion_nand_probe(struct platform_device *pdev)
 		goto no_dev;
 	}
 
-#ifdef CONFIG_MTD_CMDLINE_PARTS
 	mtd->name = "orion_nand";
-	num_part = parse_mtd_partitions(mtd, part_probes, &partitions, 0);
-#endif
+	num_part = parse_mtd_partitions(mtd, NULL, &partitions, 0);
 	/* If cmdline partitions have been passed, let them be used */
 	if (num_part <= 0) {
 		num_part = board->nr_parts;