diff options
| author | Anton Vorontsov <anton@enomsg.org> | 2013-01-05 20:14:22 -0500 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-01-05 20:14:22 -0500 |
| commit | 240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983 (patch) | |
| tree | 8481027b056197db888e51eae47a8f95931b84cb /include/linux/mfd | |
| parent | 2fbb520d2079186727786b728ebc5bf20fc85520 (diff) | |
| parent | 215cf5c93d2deda4df38d0c9b2429ab2e86808a5 (diff) | |
Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500
Diffstat (limited to 'include/linux/mfd')
| -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 { | |||
| 279 | NTC_INTERNAL, | 279 | NTC_INTERNAL, |
| 280 | }; | 280 | }; |
| 281 | 281 | ||
| 282 | int bmdevs_of_probe(struct device *dev, | 282 | int ab8500_bm_of_probe(struct device *dev, |
| 283 | struct device_node *np, | 283 | struct device_node *np, |
| 284 | struct abx500_bm_data **battery); | 284 | struct abx500_bm_data *bm); |
| 285 | 285 | ||
| 286 | int abx500_set_register_interruptible(struct device *dev, u8 bank, u8 reg, | 286 | int abx500_set_register_interruptible(struct device *dev, u8 bank, u8 reg, |
| 287 | u8 value); | 287 | u8 value); |