diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b6fccb07123e206e23a4b73534d4891f66753b90..184bc88727995f02d706ea3233de16effea2c948 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2064,6 +2064,7 @@ config OLPC
 	bool "One Laptop Per Child support"
 	select GPIOLIB
 	select OLPC_OPENFIRMWARE
+	depends on !X86_64 && !X86_PAE
 	---help---
 	  Add support for detecting the unique features of the OLPC
 	  XO hardware.