Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752612AbbBLTnX (ORCPT ); Thu, 12 Feb 2015 14:43:23 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:60939 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751311AbbBLTnW (ORCPT ); Thu, 12 Feb 2015 14:43:22 -0500 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, arm@kernel.org, Arnd Bergmann , Heiko Stuebner , 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 Message-Id: <1423770163-583064-10-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1423770163-583064-1-git-send-email-arnd@arndb.de> References: <1423770163-583064-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:FwVcXtJCfXjJIrNrWFu74Sy4b7sblcMpvS88sSP/OO+89zII/LU eWVMqW0N50tdNxmEb7081wfQLu07KhQItwVWfY2MZaYBO763L8xPd9ojrAInQ94gXaxuUDF mNTmYRRgRByTK0cHSfnQwlXGqPNFHh6/glm4005BrywRoGO57OLezbQlr+sXafXlZJ0dNd/ VB8AN5+U5XUaqAFjs6RRA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1258 Lines: 40 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 Cc: Heiko Stuebner 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/