diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 10:08:14 (GMT) |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-08-21 10:08:14 (GMT) |
commit | 828fa1e60117535d9b1e1b09444842ae66e8424d (patch) | |
tree | 281f5bff9a12c760ca947a98569df63c8ca85909 /drivers/mfd/da9055-core.c | |
parent | 09fd86780bb4603df1886e17127f5beb97f70ffb (diff) | |
parent | 8a105ca202b1a1061a24f1e980206cd2808e2f8b (diff) | |
download | linux-fsl-qoriq-828fa1e60117535d9b1e1b09444842ae66e8424d.tar.xz |
Merge tag 'mfd-lee-3.12-1' of git://git.linaro.org/people/ljones/mfd
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/da9055-core.c')
-rw-r--r-- | drivers/mfd/da9055-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/da9055-core.c b/drivers/mfd/da9055-core.c index e4c0596..d3670cd 100644 --- a/drivers/mfd/da9055-core.c +++ b/drivers/mfd/da9055-core.c @@ -379,7 +379,7 @@ static struct regmap_irq_chip da9055_regmap_irq_chip = { int da9055_device_init(struct da9055 *da9055) { - struct da9055_pdata *pdata = da9055->dev->platform_data; + struct da9055_pdata *pdata = dev_get_platdata(da9055->dev); int ret; uint8_t clear_events[3] = {0xFF, 0xFF, 0xFF}; |