diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-01-27 21:26:36 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-02-18 12:20:28 +0100 |
| commit | c8823e7a9ef1454a571f4e2052b73526c1d617f6 (patch) | |
| tree | c511dd13f31410e5fa0c29ddb4ec200749e8c13f /arch/arm | |
| parent | 1aeb3c5c48bebf0bb608c861612c76bdcd0205e6 (diff) | |
| download | linux-c8823e7a9ef1454a571f4e2052b73526c1d617f6.tar.gz linux-c8823e7a9ef1454a571f4e2052b73526c1d617f6.tar.bz2 linux-c8823e7a9ef1454a571f4e2052b73526c1d617f6.zip | |
ARM: rockchip: make rockchip_suspend_init conditional
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>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Cc: linux-rockchip@lists.infradead.org
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-rockchip/pm.h | 6 |
1 files changed, 6 insertions, 0 deletions
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 |