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 <[email protected]>
---
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
On Tue, Apr 02, 2013 at 08:20:38AM +0800, Axel Lin wrote:
> 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':
Lee?
On Tue, 02 Apr 2013, Mark Brown wrote:
> On Tue, Apr 02, 2013 at 08:20:38AM +0800, Axel Lin wrote:
> > 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':
>
> Lee?
Better if you can send me the whole patch.
We're not paying by the Byte anymore. :)
I'll look into it.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
On Tue, Apr 02, 2013 at 12:45:49PM +0100, Lee Jones wrote:
> On Tue, 02 Apr 2013, Mark Brown wrote:
> > Lee?
> Better if you can send me the whole patch.
You were on the CC for the original posting of this and the other one
you didn't reply to (both sent today) but ignored them for some reason.
On Tue, 02 Apr 2013, Mark Brown wrote:
> On Tue, Apr 02, 2013 at 08:20:38AM +0800, Axel Lin wrote:
> > 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':
>
> Lee?
Ah yes, I see what's happened.
CONFIG_REGULATOR_AB8500_EXT was used to conditionally build the AB8500
External Regulator driver, but now we just 'build it anyway' on Mark's
request. However, the guards are still remaining in some places.
Please don't action this patch. I'll fix it up properly by removing
the surplus guards.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog