---

yaml --- r: 231488 b: refs/heads/master c: 76d1f7b h: refs/heads/master v: v3
git-mirror · Jan 14, 2011 · 1051c9e · 1051c9e
1 parent 418d581
commit 1051c9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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.