summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorThomas Gleixner2011-02-23 09:50:15 +0100
committerThomas Gleixner2011-02-23 10:40:45 +0100
commit540089798d2ae115fc9bff7ed3823c8c32249607 (patch)
tree08a8adbfc818310baa4d8248178dadf2f5aca331 /arch/x86/Kconfig
parentMerge branch 'linus' into x86/platform (diff)
downloadkernel-qcow2-linux-540089798d2ae115fc9bff7ed3823c8c32249607.tar.gz
kernel-qcow2-linux-540089798d2ae115fc9bff7ed3823c8c32249607.tar.xz
kernel-qcow2-linux-540089798d2ae115fc9bff7ed3823c8c32249607.zip
x86: OLPC: Remove redundant !X64_64 config dependency
OLPC is under if X86_32 already. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Andres Salomon <dilinger@queued.net>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d5ed94d30aad..e327f96b8805 100644
--- a/arch/x86/Kconfig
+++ b/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