* [PATCH] ARM: mxs: Fix mxs_pm_init if CONFIG_PM undefined
@ 2013-07-01 11:36 Marek Vasut
2013-07-01 11:42 ` Fabio Estevam
0 siblings, 1 reply; 3+ messages in thread
From: Marek Vasut @ 2013-07-01 11:36 UTC (permalink / raw)
To: linux-arm-kernel
In case the CONFIG_PM is not defined, the mxs_pm_init() from pm.c
is not compiled and therefore mxs_pm_init() is not available. Make
sure that the kernel builds even if CONFIG_PM is not defined.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-mxs/pm.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/mach-mxs/pm.h b/arch/arm/mach-mxs/pm.h
index f57e7cd..9f1dcf0 100644
--- a/arch/arm/mach-mxs/pm.h
+++ b/arch/arm/mach-mxs/pm.h
@@ -9,6 +9,10 @@
#ifndef __ARCH_MXS_PM_H
#define __ARCH_MXS_PM_H
+#ifdef CONFIG_PM
void mxs_pm_init(void);
+#else
+static inline void mxs_pm_init(void) {}
+#endif
#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ARM: mxs: Fix mxs_pm_init if CONFIG_PM undefined
2013-07-01 11:36 [PATCH] ARM: mxs: Fix mxs_pm_init if CONFIG_PM undefined Marek Vasut
@ 2013-07-01 11:42 ` Fabio Estevam
2013-07-01 11:45 ` Marek Vasut
0 siblings, 1 reply; 3+ messages in thread
From: Fabio Estevam @ 2013-07-01 11:42 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 1, 2013 at 8:36 AM, Marek Vasut <marex@denx.de> wrote:
> In case the CONFIG_PM is not defined, the mxs_pm_init() from pm.c
> is not compiled and therefore mxs_pm_init() is not available. Make
> sure that the kernel builds even if CONFIG_PM is not defined.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Shawn Guo <shawn.guo@linaro.org>
Arnd has already sent a fix for this:
http://www.spinics.net/lists/arm-kernel/msg254288.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ARM: mxs: Fix mxs_pm_init if CONFIG_PM undefined
2013-07-01 11:42 ` Fabio Estevam
@ 2013-07-01 11:45 ` Marek Vasut
0 siblings, 0 replies; 3+ messages in thread
From: Marek Vasut @ 2013-07-01 11:45 UTC (permalink / raw)
To: linux-arm-kernel
Dear Fabio Estevam,
> On Mon, Jul 1, 2013 at 8:36 AM, Marek Vasut <marex@denx.de> wrote:
> > In case the CONFIG_PM is not defined, the mxs_pm_init() from pm.c
> > is not compiled and therefore mxs_pm_init() is not available. Make
> > sure that the kernel builds even if CONFIG_PM is not defined.
> >
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Shawn Guo <shawn.guo@linaro.org>
>
> Arnd has already sent a fix for this:
> http://www.spinics.net/lists/arm-kernel/msg254288.html
Ok, thanks. Will this hit 3.10 in any subsequent update?
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-01 11:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-01 11:36 [PATCH] ARM: mxs: Fix mxs_pm_init if CONFIG_PM undefined Marek Vasut
2013-07-01 11:42 ` Fabio Estevam
2013-07-01 11:45 ` Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).