From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, arm@kernel.org,
Arnd Bergmann <arnd@arndb.de>, Heiko Stuebner <heiko@sntech.de>,
linux-rockchip@lists.infradead.org
Subject: [PATCH 09/11] ARM: rockchip: make rockchip_suspend_init conditional
Date: Thu, 12 Feb 2015 20:42:41 +0100 [thread overview]
Message-ID: <1423770163-583064-10-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1423770163-583064-1-git-send-email-arnd@arndb.de>
If CONFIG_PM_SLEEP is disabled, we get a build error for rockchips:
arch/arm/mach-rockchip/built-in.o: In function `rockchip_dt_init':
:(.init.text+0x1c): undefined reference to `rockchip_suspend_init'
This adds an inline alternative for that case.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: linux-rockchip@lists.infradead.org
---
arch/arm/mach-rockchip/pm.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/mach-rockchip/pm.h b/arch/arm/mach-rockchip/pm.h
index 7d752ff39f91..7c889c04604b 100644
--- a/arch/arm/mach-rockchip/pm.h
+++ b/arch/arm/mach-rockchip/pm.h
@@ -24,7 +24,13 @@ extern unsigned long rkpm_bootdata_ddr_data;
extern unsigned long rk3288_bootram_sz;
void rockchip_slp_cpu_resume(void);
+#ifdef CONFIG_PM_SLEEP
void __init rockchip_suspend_init(void);
+#else
+static inline void rockchip_suspend_init(void)
+{
+}
+#endif
/****** following is rk3288 defined **********/
#define RK3288_PMU_WAKEUP_CFG0 0x00
--
2.1.0.rc2
next prev parent reply other threads:[~2015-02-12 19:43 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-12 19:42 [PATCH 00/11] ARM: random randconfig fixes, soc specific Arnd Bergmann
2015-02-12 19:42 ` [PATCH 01/11] ARM: vexpress: use ARM_CPU_SUSPEND if needed Arnd Bergmann
2015-02-13 1:31 ` Nicolas Pitre
2015-02-13 10:37 ` Liviu Dudau
2015-02-13 10:57 ` Russell King - ARM Linux
2015-02-13 11:01 ` Liviu Dudau
2015-02-13 11:16 ` Russell King - ARM Linux
2015-02-13 11:22 ` Liviu Dudau
2015-02-13 23:03 ` Nicolas Pitre
2015-02-13 22:55 ` Nicolas Pitre
2015-02-14 1:34 ` Liviu Dudau
2015-02-14 20:42 ` Lorenzo Pieralisi
2015-02-12 19:42 ` [PATCH 02/11] ARM: sunxi: always select RESET_CONTROLLER Arnd Bergmann
2015-02-13 9:09 ` Maxime Ripard
2015-02-16 20:47 ` Arnd Bergmann
2015-02-12 19:42 ` [PATCH 03/11] ARM: BCM: put back ARCH_MULTI_V7 dependency for mobile Arnd Bergmann
2015-02-12 20:02 ` Florian Fainelli
2015-02-12 20:08 ` arnd
2015-02-12 21:57 ` Florian Fainelli
2015-02-12 22:07 ` Scott Branden
2015-02-12 19:42 ` [PATCH 04/11] ARM: davinci: davinci_cfg_reg cannot be init Arnd Bergmann
2015-02-16 15:37 ` Sekhar Nori
2015-02-12 19:42 ` [PATCH 05/11] ARM: davinci: multi-soc kernels require AUTO_ZRELADDR Arnd Bergmann
2015-02-16 15:50 ` Sekhar Nori
2015-02-12 19:42 ` [PATCH 06/11] ARM: at91: fix pm declarations Arnd Bergmann
2015-02-13 8:37 ` Nicolas Ferre
2015-02-12 19:42 ` [PATCH 07/11] ARM: prima2: do not select SMP_ON_UP Arnd Bergmann
2015-02-13 3:05 ` Barry Song
2015-02-12 19:42 ` [PATCH 08/11] ARM: ixp4xx: fix {in,out}s{bwl} data types Arnd Bergmann
2015-02-16 14:16 ` Krzysztof Hałasa
2015-02-12 19:42 ` Arnd Bergmann [this message]
2015-02-13 19:26 ` [PATCH 09/11] ARM: rockchip: make rockchip_suspend_init conditional Heiko Stübner
2015-02-12 19:42 ` [PATCH 10/11] ARM: sti: always enable RESET_CONTROLLER Arnd Bergmann
2015-02-13 7:28 ` Patrice Chotard
2015-02-13 8:09 ` Maxime Coquelin
2015-02-12 19:42 ` [PATCH 11/11] ARM: mvebu: build armada375-smp code conditionally Arnd Bergmann
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=1423770163-583064-10-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®