Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af23231a authored by Borislav Petkov's avatar Borislav Petkov Committed by Greg Kroah-Hartman
Browse files

x86/olpc: Fix build error with CONFIG_MFD_CS5535=m 



[ 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: default avatarBorislav Petkov <bp@suse.de>
Cc: Lubomir Rintel <lkundrak@v3.sk>
Cc: x86@kernel.org
Link: http://lkml.kernel.org/r/20181005131750.GA5366@zn.tnic


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 624cd074

arch/x86/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -2771,8 +2771,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.