diff options
| author | Anton Vorontsov <anton@enomsg.org> | 2013-01-06 02:14:22 +0100 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-01-06 02:14:22 +0100 |
| commit | 240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983 (patch) | |
| tree | 8481027b056197db888e51eae47a8f95931b84cb /include | |
| parent | charger_manager: Don't use [delayed_]work_pending() (diff) | |
| parent | ab8500_bm: Make the battery Device Tree node reference less cryptic (diff) | |
| download | linux-240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983.tar.xz linux-240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983.zip | |
Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/abx500.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h index 2138bd33021a..4906b1842d2f 100644 --- a/include/linux/mfd/abx500.h +++ b/include/linux/mfd/abx500.h @@ -279,9 +279,9 @@ enum { NTC_INTERNAL, }; -int bmdevs_of_probe(struct device *dev, - struct device_node *np, - struct abx500_bm_data **battery); +int ab8500_bm_of_probe(struct device *dev, + struct device_node *np, + struct abx500_bm_data *bm); int abx500_set_register_interruptible(struct device *dev, u8 bank, u8 reg, u8 value); |