[PATCH AUTOSEL 4.14 073/115] x86/olpc: Fix build error with CONFIG_MFD_CS5535=m

From: Sasha Levin
Date: Tue Nov 12 2019 - 21:12:27 EST


From: Borislav Petkov <bp@xxxxxxx>

[ 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 <bp@xxxxxxx>
Cc: Lubomir Rintel <lkundrak@xxxxx>
Cc: x86@xxxxxxxxxx
Link: http://lkml.kernel.org/r/20181005131750.GA5366@xxxxxxx
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
arch/x86/Kconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8fec1585ac7ab..ce147c0e76f0d 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2671,8 +2671,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