Merge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

[~andy/linux] / drivers / mfd / wm8400-core.c

diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
index 3a6e78cb038458936e4679483ba564ac98f25936..597f82edacaa8cc010aaa2b3e28d3e5985a17f81 100644 (file)
--- a/drivers/mfd/wm8400-core.c
+++ b/drivers/mfd/wm8400-core.c
@@ -245,7 +245,8 @@ static int wm8400_register_codec(struct wm8400 *wm8400)
 {
        struct mfd_cell cell = {
                .name = "wm8400-codec",
-               .mfd_data = wm8400,
+               .platform_data = wm8400,
+               .pdata_size = sizeof(*wm8400),
        };
 
        return mfd_add_devices(wm8400->dev, -1, &cell, 1, NULL, 0);