Commit c8823e7a authored Jan 27, 2015 by Arnd Bergmann

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

parent 1aeb3c5c

arch/arm/mach-rockchip/pm.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -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