From e7609c741778afb97a0b87e75d037dfbb1c297e2 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@openedhand.com>
Date: Fri, 1 Aug 2008 00:16:13 +0200
Subject: [PATCH] --- yaml --- r: 108153 b: refs/heads/master c:
 56bf2bda0651ca368a259468e4f309c71ed35c35 h: refs/heads/master i:   108151:
 674cb36e4a1444b1b19e835a86dfcc85856a4895 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/mfd/t7l66xb.c  | 11 ++++++++---
 trunk/drivers/mfd/tc6387xb.c |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a6125840ac7c..9e1544273706 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: befb844415f4e3b9c48594d05238a8a4c2af8941
+refs/heads/master: 56bf2bda0651ca368a259468e4f309c71ed35c35
diff --git a/trunk/drivers/mfd/t7l66xb.c b/trunk/drivers/mfd/t7l66xb.c
index 5be42054f739..2d715fcea76f 100644
--- a/trunk/drivers/mfd/t7l66xb.c
+++ b/trunk/drivers/mfd/t7l66xb.c
@@ -338,9 +338,14 @@ static int t7l66xb_probe(struct platform_device *dev)
 	t7l66xb_attach_irq(dev);
 
 	t7l66xb_cells[T7L66XB_CELL_NAND].driver_data = pdata->nand_data;
+	t7l66xb_cells[T7L66XB_CELL_NAND].platform_data =
+		&t7l66xb_cells[T7L66XB_CELL_NAND];
+	t7l66xb_cells[T7L66XB_CELL_NAND].data_size =
+		sizeof(t7l66xb_cells[T7L66XB_CELL_NAND]);
 
-	ret = mfd_add_devices(dev, t7l66xb_cells, ARRAY_SIZE(t7l66xb_cells),
-		iomem, t7l66xb->irq_base);
+	ret = mfd_add_devices(&dev->dev, dev->id,
+			      t7l66xb_cells, ARRAY_SIZE(t7l66xb_cells),
+			      iomem, t7l66xb->irq_base);
 
 	if (!ret)
 		return 0;
@@ -366,7 +371,7 @@ static int t7l66xb_remove(struct platform_device *dev)
 	t7l66xb_detach_irq(dev);
 	iounmap(t7l66xb->scr);
 	release_resource(&t7l66xb->rscr);
-	mfd_remove_devices(dev);
+	mfd_remove_devices(&dev->dev);
 	platform_set_drvdata(dev, NULL);
 	kfree(t7l66xb);
 
diff --git a/trunk/drivers/mfd/tc6387xb.c b/trunk/drivers/mfd/tc6387xb.c
index 03718feda4d8..9fd6f80b50f6 100644
--- a/trunk/drivers/mfd/tc6387xb.c
+++ b/trunk/drivers/mfd/tc6387xb.c
@@ -119,8 +119,8 @@ static int tc6387xb_probe(struct platform_device *dev)
 
 	printk(KERN_INFO "Toshiba tc6387xb initialised\n");
 
-	ret = mfd_add_devices(dev, tc6387xb_cells,
-		ARRAY_SIZE(tc6387xb_cells), iomem, irq);
+	ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells,
+			      ARRAY_SIZE(tc6387xb_cells), iomem, irq);
 
 	if (!ret)
 		return 0;