diff --git a/[refs] b/[refs]
index 08aa3a3e0090..e596c155215d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7e23d913aafc93fc5f119e1be17620073cc3811
+refs/heads/master: a50367784ea6ef8d4276daac0dfcfaa896f8530b
diff --git a/trunk/drivers/mtd/nand/plat_nand.c b/trunk/drivers/mtd/nand/plat_nand.c
index cd725fc5e813..f6d5c2adc4fd 100644
--- a/trunk/drivers/mtd/nand/plat_nand.c
+++ b/trunk/drivers/mtd/nand/plat_nand.c
@@ -110,7 +110,9 @@ static int __init plat_nand_probe(struct platform_device *pdev)
 static int __devexit plat_nand_remove(struct platform_device *pdev)
 {
 	struct plat_nand_data *data = platform_get_drvdata(pdev);
+#ifdef CONFIG_MTD_PARTITIONS
 	struct platform_nand_data *pdata = pdev->dev.platform_data;
+#endif
 
 	nand_release(&data->mtd);
 #ifdef CONFIG_MTD_PARTITIONS