From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965355AbbBDKra (ORCPT ); Wed, 4 Feb 2015 05:47:30 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:16596 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933434AbbBDKrY (ORCPT ); Wed, 4 Feb 2015 05:47:24 -0500 X-AuditID: cbfec7f5-b7fc86d0000066b7-db-54d1f807c0b8 From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org Cc: Marek Szyprowski , Bartlomiej Zolnierkiewicz , Krzysztof Kozlowski Subject: [PATCH] regulator: Fix build breakage on !REGULATOR Date: Wed, 04 Feb 2015 11:45:28 +0100 Message-id: <1423046728-31000-1-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrEJMWRmVeSWpSXmKPExsVy+t/xK7rsPy6GGOy/JmKxccZ6VoupD5+w Wbx+YWjx7UoHk8XlXXPYLNYeucvuwOaxc9Zddo9NqzrZPPq2rGL0+LxJLoAlissmJTUnsyy1 SN8ugSvj1ISNLAXneSp23O9nbGBs4u5i5OCQEDCROPRYtouRE8gUk7hwbz1bFyMXh5DAUkaJ tQs7mCGcPiaJpZNPM4NUsQkYS2xevoQNxBYRyJDYPG8qK0gRs8AMRol7C3exgEwVFrCR+LYi F6SGRUBV4tD33+wgNq+Au8SptXtYIbbJSZw8Npl1AiP3AkaGVYyiqaXJBcVJ6blGesWJucWl eel6yfm5mxgh4fB1B+PSY1aHGAU4GJV4eDt6L4YIsSaWFVfmHmKU4GBWEuGtPgYU4k1JrKxK LcqPLyrNSS0+xMjEwSnVwKj//4y2ne3mKocSdq91JfGSoaKXHc8HFLr4+W1deUvgz4rahi2O n17kP/t5dHvzu/XdFu6mLnNtL3yy+9sT2vZP93eHS2v0UQ+241d87gap7m1/cnfqNoFlrP/v S+8O2hWQ0Xi17SrDibanFqfnnP0QHctyu29CmneR2hxjnYUqinf1TjP8m6bEUpyRaKjFXFSc CABSow7X5QEAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add missing stubs for regulator_suspend_prepare() and regulator_suspend_finish() to fix exynos_defconfig build without REGULATOR: arch/arm/mach-exynos/built-in.o: In function `exynos_suspend_finish': arch/arm/mach-exynos/suspend.c:537: undefined reference to `regulator_suspend_finish' arch/arm/mach-exynos/built-in.o: In function `exynos_suspend_prepare': arch/arm/mach-exynos/suspend.c:520: undefined reference to `regulator_suspend_prepare' make: *** [vmlinux] Error 1 Signed-off-by: Krzysztof Kozlowski Reported-by: Joerg Roedel Reported-by: Marek Szyprowski --- include/linux/regulator/machine.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h index 0b08d05d470b..b07562e082c4 100644 --- a/include/linux/regulator/machine.h +++ b/include/linux/regulator/machine.h @@ -191,15 +191,22 @@ struct regulator_init_data { void *driver_data; /* core does not touch this */ }; -int regulator_suspend_prepare(suspend_state_t state); -int regulator_suspend_finish(void); - #ifdef CONFIG_REGULATOR void regulator_has_full_constraints(void); +int regulator_suspend_prepare(suspend_state_t state); +int regulator_suspend_finish(void); #else static inline void regulator_has_full_constraints(void) { } +static inline int regulator_suspend_prepare(suspend_state_t state) +{ + return 0; +} +static inline int regulator_suspend_finish(void) +{ + return 0; +} #endif #endif -- 1.9.1