diff options
| author | Simon Wilson <simonwilson@google.com> | 2011-07-14 16:19:11 -0700 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2011-07-14 16:19:22 -0700 |
| commit | 3bfc0619c2746abfdec7a6464827ac70d3cec77e (patch) | |
| tree | 7c910be930763bfd4ca9297b268dc143926f4167 /drivers/mfd | |
| parent | 726f1bf67a99d2ff80b98bb5e3ca1be5827bd0e6 (diff) | |
| parent | cf32e8e5bf2f51bb291afb802b86c82b44520873 (diff) | |
| download | kernel_samsung_tuna-3bfc0619c2746abfdec7a6464827ac70d3cec77e.zip kernel_samsung_tuna-3bfc0619c2746abfdec7a6464827ac70d3cec77e.tar.gz kernel_samsung_tuna-3bfc0619c2746abfdec7a6464827ac70d3cec77e.tar.bz2 | |
Merge branch 'linux-omap-audio-3.0' into linux-omap-3.0
Signed-off-by: Simon Wilson <simonwilson@google.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl6040-codec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/twl6040-codec.c b/drivers/mfd/twl6040-codec.c index 993d90b..a726e36 100644 --- a/drivers/mfd/twl6040-codec.c +++ b/drivers/mfd/twl6040-codec.c @@ -616,6 +616,7 @@ static int __devinit twl6040_probe(struct platform_device *pdev) cell = &twl6040->cells[children]; cell->name = "twl6040-codec"; cell->platform_data = pdata->audio; + cell->pdata_size = sizeof(*pdata->audio); children++; } @@ -623,6 +624,7 @@ static int __devinit twl6040_probe(struct platform_device *pdev) cell = &twl6040->cells[children]; cell->name = "twl6040-vibra"; cell->platform_data = pdata->vibra; + cell->pdata_size = sizeof(*pdata->vibra); children++; } |