diff --git a/[refs] b/[refs]
index ec20a3df326d..43d93169c7ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78dd9e3500873edd6005a41f8ba178eacbff64c5
+refs/heads/master: 0dc8626a17ab8dea9f1e34c7a5d667f5331b0ddc
diff --git a/trunk/drivers/mtd/nand/plat_nand.c b/trunk/drivers/mtd/nand/plat_nand.c
index ccdb16ec8143..746a723b4933 100644
--- a/trunk/drivers/mtd/nand/plat_nand.c
+++ b/trunk/drivers/mtd/nand/plat_nand.c
@@ -109,8 +109,6 @@ static int __devinit plat_nand_probe(struct platform_device *pdev)
 			return 0;
 		}
 	}
-	if (pdata->chip.set_parts)
-		pdata->chip.set_parts(data->mtd.size, &pdata->chip);
 	if (pdata->chip.partitions) {
 		data->parts = pdata->chip.partitions;
 		err = mtd_device_register(&data->mtd, data->parts,
diff --git a/trunk/include/linux/mtd/nand.h b/trunk/include/linux/mtd/nand.h
index 4a43ffc535c9..0f239e714219 100644
--- a/trunk/include/linux/mtd/nand.h
+++ b/trunk/include/linux/mtd/nand.h
@@ -619,8 +619,6 @@ struct platform_nand_chip {
 	unsigned int options;
 	unsigned int bbt_options;
 	const char **part_probe_types;
-	void (*set_parts)(uint64_t size, struct platform_nand_chip *chip);
-	void *priv;
 };
 
 /* Keep gcc happy */