From: Axel Lin <axel.lin@ingics.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Bengt Jonsson <bengt.g.jonsson@stericsson.com>,
Lee Jones <lee.jones@linaro.org>,
Yvan FILLION <yvan.fillion@stericsson.com>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] regulator: ab8500: Staticize ab8500_ext_regulator_[init|exit] if !CONFIG_REGULATOR_AB8500_EXT
Date: Tue, 02 Apr 2013 08:20:38 +0800 [thread overview]
Message-ID: <1364862038.15806.1.camel@phoenix> (raw)
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
next reply other threads:[~2013-04-02 0:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-02 0:20 Axel Lin [this message]
2013-04-02 11:27 ` [PATCH] regulator: ab8500: Staticize ab8500_ext_regulator_[init|exit] if !CONFIG_REGULATOR_AB8500_EXT Mark Brown
2013-04-02 11:45 ` Lee Jones
2013-04-02 11:51 ` Mark Brown
2013-04-02 12:05 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364862038.15806.1.camel@phoenix \
--to=axel.lin@ingics.com \
--cc=bengt.g.jonsson@stericsson.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=yvan.fillion@stericsson.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.