summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-04-02 13:24:05 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-02 23:01:41 +0100
commit35e1d5f6344ed1bb2fab61ac7934aa0f19908b2c (patch)
tree26bd1cb2176e9537168fa21f1cfdd30ddcf4a341
parent0fbc800726aaece4c549358e56ee774dcc089960 (diff)
downloadop-kernel-dev-35e1d5f6344ed1bb2fab61ac7934aa0f19908b2c.zip
op-kernel-dev-35e1d5f6344ed1bb2fab61ac7934aa0f19908b2c.tar.gz
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 bb0140c..44f67e8 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -320,21 +320,6 @@ struct ab8500_regulator_platform_data {
struct regulator_init_data *ext_regulator;
};
-/* AB8500 external regulator functions (internal) */
-#ifdef CONFIG_REGULATOR_AB8500_EXT
-int ab8500_ext_regulator_init(struct platform_device *pdev);
-int ab8500_ext_regulator_exit(struct platform_device *pdev);
-#else
-inline int ab8500_ext_regulator_init(struct platform_device *pdev)
-{
- return 0;
-}
-inline int ab8500_ext_regulator_exit(struct platform_device *pdev)
-{
- return 0;
-}
-#endif
-
#ifdef CONFIG_REGULATOR_AB8500_DEBUG
int ab8500_regulator_debug_init(struct platform_device *pdev);
int ab8500_regulator_debug_exit(struct platform_device *pdev);
@@ -349,4 +334,8 @@ static inline int ab8500_regulator_debug_exit(struct platform_device *pdev)
}
#endif
+/* AB8500 external regulator functions. */
+int ab8500_ext_regulator_init(struct platform_device *pdev);
+int ab8500_ext_regulator_exit(struct platform_device *pdev);
+
#endif
OpenPOWER on IntegriCloud