---

yaml --- r: 108153 b: refs/heads/master c: 56bf2bd h: refs/heads/master i: 108151: 674cb36 v: v3
git-mirror · Aug 10, 2008 · e7609c7 · e7609c7
1 parent e69f313
commit e7609c7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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;