Browse Source

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>
Lee Jones 12 years ago
parent
commit
35e1d5f634
1 changed files with 4 additions and 15 deletions
  1. 4 15
      include/linux/regulator/ab8500.h

+ 4 - 15
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