diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-01 06:17:06 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-01 06:17:06 -0400 |
| commit | c84130e7006cacf05e8691ed4d6e5796910dac03 (patch) | |
| tree | cab75a73d18547cf7857b417c4d44fb6aa23f688 /include | |
| parent | 28120bf84929167d2a712f037a960add5e1584f5 (diff) | |
| parent | 08d49f4372ebee2b06d6988ecca37612fdc5b897 (diff) | |
Merge remote-tracking branch 'regulator/topic/ab8500' into regulator-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regulator/ab8500.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 7c5ff0c55773..75307447cef9 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h | |||
| @@ -336,8 +336,4 @@ static inline int ab8500_regulator_debug_exit(struct platform_device *pdev) | |||
| 336 | } | 336 | } |
| 337 | #endif | 337 | #endif |
| 338 | 338 | ||
| 339 | /* AB8500 external regulator functions. */ | ||
| 340 | int ab8500_ext_regulator_init(struct platform_device *pdev); | ||
| 341 | void ab8500_ext_regulator_exit(struct platform_device *pdev); | ||
| 342 | |||
| 343 | #endif | 339 | #endif |