From 3990c6c5de40ceedb8af4a3c5cd3b3fab6606736 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 23 Feb 2011 09:50:15 +0100 Subject: [PATCH] --- yaml --- r: 234914 b: refs/heads/master c: 540089798d2ae115fc9bff7ed3823c8c32249607 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a5ce507f3a90..841e31d13532 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7acdbb3f35f4d08c0c4f7cfa306bc7006b6ba902 +refs/heads/master: 540089798d2ae115fc9bff7ed3823c8c32249607 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index d5ed94d30aad..e327f96b8805 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -2068,7 +2068,7 @@ config OLPC bool "One Laptop Per Child support" select GPIOLIB select OLPC_OPENFIRMWARE - depends on !X86_64 && !X86_PAE + depends on !X86_PAE ---help--- Add support for detecting the unique features of the OLPC XO hardware. @@ -2081,7 +2081,7 @@ config OLPC_XO1 config OLPC_OPENFIRMWARE bool "Support for OLPC's Open Firmware" - depends on !X86_64 && !X86_PAE + depends on !X86_PAE default n select OF help