Merge branch 'for-linus' into for-3.1/core

[platform/kernel/linux-rpi.git] / drivers / mfd / tc6387xb.c

diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index b006f7c..ad715bf 100644 (file)
--- 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,
-               .mfd_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,
        },