From: marex@denx.de (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: mxs: stub out mxs_pm_init for !CONFIG_PM
Date: Mon, 30 Sep 2013 00:50:19 +0200 [thread overview]
Message-ID: <201309300050.20047.marex@denx.de> (raw)
In-Reply-To: <2964094.prhBouhISv@wuerfel>
Hello Greg,
> When building a kernel without CONFIG_PM, we get a link
> error from referencing mxs_pm_init in the machine
> descriptor. This defines a macro to NULL for that case.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Shawn Guo <shawn.guo@linaro.org>
>
> diff --git a/arch/arm/mach-mxs/pm.h b/arch/arm/mach-mxs/pm.h
> index f57e7cd..09d77b0 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
> +#define mxs_pm_init NULL
> +#endif
>
> #endif
Can you please pick this patch for 3.10 stable? It fixes a build issue on
i.MX23/i.MX28 in case CONFIG_PM is not enabled.
Patchwork link: http://patchwork.ozlabs.org/patch/253324/
Upstream GIT:
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/arm/mach-
mxs/pm.h?id=7a9caf59f60e55a8caf96f856713bd0ef0cc25a7
Thank you!
Best regards,
Marek Vasut
next prev parent reply other threads:[~2013-09-29 22:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-21 23:30 [PATCH] ARM: mxs: stub out mxs_pm_init for !CONFIG_PM Arnd Bergmann
2013-06-24 7:04 ` Shawn Guo
2013-09-29 22:50 ` Marek Vasut [this message]
2013-09-30 1:26 ` Fabio Estevam
2013-10-01 4:14 ` Marek Vasut
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=201309300050.20047.marex@denx.de \
--to=marex@denx.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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.