diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:53:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:53:26 +1100 |
| commit | 77afbd2c51f61ebe4a241a3ca445c2e470a5578d (patch) | |
| tree | 597eec162f655461489aeb73de5d492b68e00456 /drivers/power | |
| parent | e9657304d0171ad723ad03d4dbdae592c8f3a969 (diff) | |
| parent | a1751461bed6fa6bcaea3c77f35476b54230c120 (diff) | |
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-imx/mach-pcm038.c
arch/arm/mach-mx3/mach-mx31_3ds.c
arch/arm/mach-mx3/mach-mx31moboard.c
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/jz4740-battery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c index 02414db6a94c..0938650a466c 100644 --- a/drivers/power/jz4740-battery.c +++ b/drivers/power/jz4740-battery.c @@ -258,7 +258,7 @@ static int __devinit jz_battery_probe(struct platform_device *pdev) return -ENOMEM; } - jz_battery->cell = pdev->dev.platform_data; + jz_battery->cell = mfd_get_cell(pdev); jz_battery->irq = platform_get_irq(pdev, 0); if (jz_battery->irq < 0) { |