From 1051c9e2af1b9521f818b53d3a69261f33b22639 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Fri, 14 Jan 2011 11:57:06 -0800
Subject: [PATCH] --- yaml --- r: 231488 b: refs/heads/master c:
 76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/arch/x86/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 80a5e73547a6..f2c0cedcf7be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6550904ddbc3c286798a87edf95eeebcc62bc58a
+refs/heads/master: 76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index b6fccb07123e..184bc8872799 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/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.