diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e98f2dea2ba0feb2ab10c9df8b95f97d4d554dc0..e297c797e214895811c7fe425fbb80b5e74c2a86 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2786,8 +2786,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.