diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index eb7f43f235211..a9f0048b880a0 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2770,11 +2770,9 @@ config OLPC_XO1_RTC
 
 config OLPC_XO1_SCI
 	bool "OLPC XO-1 SCI extras"
-	depends on OLPC && OLPC_XO1_PM
+	depends on OLPC && OLPC_XO1_PM && GPIO_CS5535=y
 	depends on INPUT=y
 	select POWER_SUPPLY
-	select GPIO_CS5535
-	select MFD_CORE
 	---help---
 	  Add support for SCI-based features of the OLPC XO-1 laptop:
 	   - EC-driven system wakeups