Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index 6315f63f017d..ad715bf49cac 100644
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -131,7 +131,8 @@ static struct mfd_cell tc6387xb_cells[] = {
                 .name = "tmio-mmc",
                 .enable = tc6387xb_mmc_enable,
                 .disable = tc6387xb_mmc_disable,
-                .driver_data = &tc6387xb_mmc_data,
+                .platform_data = &tc6387xb_mmc_data,
+                .pdata_size    = sizeof(tc6387xb_mmc_data),
                 .num_resources = ARRAY_SIZE(tc6387xb_mmc_resources),
                 .resources = tc6387xb_mmc_resources,
         },
@@ -190,11 +191,6 @@ static int __devinit tc6387xb_probe(struct platform_device *dev)
 
         printk(KERN_INFO "Toshiba tc6387xb initialised\n");
 
-        tc6387xb_cells[TC6387XB_CELL_MMC].platform_data =
-                &tc6387xb_cells[TC6387XB_CELL_MMC];
-        tc6387xb_cells[TC6387XB_CELL_MMC].data_size =
-                sizeof(tc6387xb_cells[TC6387XB_CELL_MMC]);
-
         ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells,
                               ARRAY_SIZE(tc6387xb_cells), iomem, irq);