commit: 76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9
From: H. Peter Anvin <[email protected]>
Date: Fri, 14 Jan 2011 11:57:06 -0800
Subject: [PATCH] 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 <[email protected]>
Cc: Daniel Drake <[email protected]>
Cc: Andres Salomon <[email protected]>
Cc: Grant Likely <[email protected]>
LKML-Reference: <[email protected]>
Cc: <[email protected]> 2.6.37
---
 arch/x86/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b6fccb0..184bc88 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.

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to