Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / mfd / tc6387xb.c

diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index 6315f63..b006f7c 100644 (file)
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -131,7 +131,7 @@ static struct mfd_cell tc6387xb_cells[] = {
                .name = "tmio-mmc",
                .enable = tc6387xb_mmc_enable,
                .disable = tc6387xb_mmc_disable,
-               .driver_data = &tc6387xb_mmc_data,
+               .mfd_data = &tc6387xb_mmc_data,
                .num_resources = ARRAY_SIZE(tc6387xb_mmc_resources),
                .resources = tc6387xb_mmc_resources,
        },
@@ -190,11 +190,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);