aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-04-02 08:24:05 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-02 18:01:41 -0400
commit35e1d5f6344ed1bb2fab61ac7934aa0f19908b2c (patch)
tree26bd1cb2176e9537168fa21f1cfdd30ddcf4a341
parent0fbc800726aaece4c549358e56ee774dcc089960 (diff)
regulator: ab8500-ext: Remove unused REGULATOR_AB8500_EXT guard
Before the AB8500 External Regulator driver was Mainlined, it used to be conditionally compiled in using the CONFIG_REGULATOR_AB8500_EXT flag. During the review process that capability was removed, but the guard controlling prototyping slipped though the net. This patch cleans it up. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--include/linux/regulator/ab8500.h19
1 files changed, 4 insertions, 15 deletions
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index bb0140c9d4f4..44f67e8f1a6d 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -320,21 +320,6 @@ struct ab8500_regulator_platform_data {
320 struct regulator_init_data *ext_regulator; 320 struct regulator_init_data *ext_regulator;
321}; 321};
322 322
323/* AB8500 external regulator functions (internal) */
324#ifdef CONFIG_REGULATOR_AB8500_EXT
325int ab8500_ext_regulator_init(struct platform_device *pdev);
326int ab8500_ext_regulator_exit(struct platform_device *pdev);
327#else
328inline int ab8500_ext_regulator_init(struct platform_device *pdev)
329{
330 return 0;
331}
332inline int ab8500_ext_regulator_exit(struct platform_device *pdev)
333{
334 return 0;
335}
336#endif
337
338#ifdef CONFIG_REGULATOR_AB8500_DEBUG 323#ifdef CONFIG_REGULATOR_AB8500_DEBUG
339int ab8500_regulator_debug_init(struct platform_device *pdev); 324int ab8500_regulator_debug_init(struct platform_device *pdev);
340int ab8500_regulator_debug_exit(struct platform_device *pdev); 325int ab8500_regulator_debug_exit(struct platform_device *pdev);
@@ -349,4 +334,8 @@ static inline int ab8500_regulator_debug_exit(struct platform_device *pdev)
349} 334}
350#endif 335#endif
351 336
337/* AB8500 external regulator functions. */
338int ab8500_ext_regulator_init(struct platform_device *pdev);
339int ab8500_ext_regulator_exit(struct platform_device *pdev);
340
352#endif 341#endif