From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D785CC43331 for ; Wed, 13 Nov 2019 02:21:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C28F21D7F for ; Wed, 13 Nov 2019 02:21:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573611694; bh=O9BZEa+lLR5bwZmlseIeh3+YuqfpBsd14SJ2ClPgozA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=w7A6We57vZJlAWSx4kiuQEYRRdp6IT4GSNIZ8QqPMpwTPczGpwriyrs7OvGiFSxIX DJcLfEPS4mhzNnTMTgFzYID3ft6yNWa0lTvymfBTssYJntZkBzOIQd1ej0OIjXQqCu jjGiEilvuij6x+4X1Z78q97K1aJrfo33qKaUntcQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728708AbfKMCVd (ORCPT ); Tue, 12 Nov 2019 21:21:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:44148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728715AbfKMBx5 (ORCPT ); Tue, 12 Nov 2019 20:53:57 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9C30D222CD; Wed, 13 Nov 2019 01:53:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610036; bh=O9BZEa+lLR5bwZmlseIeh3+YuqfpBsd14SJ2ClPgozA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TCK9Vopcrepn1iPOCYiQAgfKTLXaWj0bBFjuqQx0tFN47mXSbOSlVMWZqGsBeEFQJ y22H2ww7gYSy0hEDhdF4fRPxRs5rQ9DNWhg6R0Yn89M5MRxC7bQj5vTujQpsmbwpCo qLGhlhC3M8jpET39hJzbJInPCVzSAGTD0M+ih/KU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Borislav Petkov , Lubomir Rintel , x86@kernel.org, Sasha Levin Subject: [PATCH AUTOSEL 4.19 128/209] x86/olpc: Fix build error with CONFIG_MFD_CS5535=m Date: Tue, 12 Nov 2019 20:49:04 -0500 Message-Id: <20191113015025.9685-128-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113015025.9685-1-sashal@kernel.org> References: <20191113015025.9685-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov [ Upstream commit fa112cf1e8bc693d5a666b1c479a2859c8b6e0f1 ] When building a 32-bit config which has the above MFD item as module but OLPC_XO1_PM is enabled =y - which is bool, btw - the kernel fails building with: ld: arch/x86/platform/olpc/olpc-xo1-pm.o: in function `xo1_pm_remove': /home/boris/kernel/linux/arch/x86/platform/olpc/olpc-xo1-pm.c:159: undefined reference to `mfd_cell_disable' ld: arch/x86/platform/olpc/olpc-xo1-pm.o: in function `xo1_pm_probe': /home/boris/kernel/linux/arch/x86/platform/olpc/olpc-xo1-pm.c:133: undefined reference to `mfd_cell_enable' make: *** [Makefile:1030: vmlinux] Error 1 Force MFD_CS5535 to y if OLPC_XO1_PM is enabled. Signed-off-by: Borislav Petkov Cc: Lubomir Rintel Cc: x86@kernel.org Link: http://lkml.kernel.org/r/20181005131750.GA5366@zn.tnic Signed-off-by: Sasha Levin --- arch/x86/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e76d16ac27764..d7bcc9f702bea 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2726,8 +2726,7 @@ config OLPC config OLPC_XO1_PM bool "OLPC XO-1 Power Management" - depends on OLPC && MFD_CS5535 && PM_SLEEP - select MFD_CORE + depends on OLPC && MFD_CS5535=y && PM_SLEEP ---help--- Add support for poweroff and suspend of the OLPC XO-1 laptop. -- 2.20.1