Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / drivers / mfd / wl1273-core.c

diff --git a/drivers/mfd/wl1273-core.c b/drivers/mfd/wl1273-core.c
index 4025a4b..f76f6c7 100644 (file)
--- a/drivers/mfd/wl1273-core.c
+++ b/drivers/mfd/wl1273-core.c
@@ -217,8 +217,7 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
 
        cell = &core->cells[children];
        cell->name = "wl1273_fm_radio";
-       cell->platform_data = &core;
-       cell->data_size = sizeof(core);
+       cell->mfd_data = &core;
        children++;
 
        core->read = wl1273_fm_read_reg;
@@ -232,8 +231,7 @@ static int __devinit wl1273_core_probe(struct i2c_client *client,
 
                dev_dbg(&client->dev, "%s: Have codec.\n", __func__);
                cell->name = "wl1273-codec";
-               cell->platform_data = &core;
-               cell->data_size = sizeof(core);
+               cell->mfd_data = &core;
                children++;
        }