diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2011-01-14 11:57:06 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-01-14 11:57:06 -0800 |
commit | 76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9 (patch) | |
tree | 99cc04216d0e7e11f3413508bd260e7af6886240 | |
parent | 6550904ddbc3c286798a87edf95eeebcc62bc58a (diff) | |
download | linux-3.10-76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9.tar.gz linux-3.10-76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9.tar.bz2 linux-3.10-76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9.zip |
x86, olpc: Add missing Kconfig dependencies
OLPC uses select for OLPC_OPENFIRMWARE, which means OLPC has to
enforce the dependencies for OLPC_OPENFIRMWARE. Make sure it does so.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Daniel Drake <dsd@laptop.org>
Cc: Andres Salomon <dilinger@queued.net>
Cc: Grant Likely <grant.likely@secretlab.ca>
LKML-Reference: <20100923162846.D8D409D401B@zog.reactivated.net>
Cc: <stable@kernel.org> 2.6.37
-rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b6fccb07123..184bc887279 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. |