[PATCH] regulator: ab8500: Staticize ab8500_ext_regulator_[init|exit] if !CONFIG_REGULATOR_AB8500_EXT

Axel Lin
2013-04-02T00:20:48Z

Fix below build errors:

LD arch/arm/mach-ux500/built-in.o
arch/arm/mach-ux500/board-mop500-regulators.o: In function `ab8500_ext_regulator_init':
include/linux/regulator/ab8500.h:331: multiple definition of `ab8500_ext_regulator_init'
arch/arm/mach-ux500/board-mop500.o:/home/axel/repos/git/regulator/include/linux/regulator/ab8500.h:331: first defined here
arch/arm/mach-ux500/board-mop500-regulators.o: In function `ab8500_ext_regulator_exit':
include/linux/regulator/ab8500.h:335: multiple definition of `ab8500_ext_regulator_exit'
arch/arm/mach-ux500/board-mop500.o:/home/axel/repos/git/regulator/include/linux/regulator/ab8500.h:335: first defined here
make[1]: *** [arch/arm/mach-ux500/built-in.o] Error 1
make: *** [arch/arm/mach-ux500] Error 2

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
include/linux/regulator/ab8500.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index bb0140c..1790059 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -325,11 +325,11 @@ struct ab8500_regulator_platform_data {
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)
+static inline int ab8500_ext_regulator_init(struct platform_device *pdev)
{
return 0;
}
-inline int ab8500_ext_regulator_exit(struct platform_device *pdev)
+static inline int ab8500_ext_regulator_exit(struct platform_device *pdev)
{
return 0;
}
--
1.7.10.4