From: H. Peter Anvin <hpa@linux.intel.com>
Date: Fri, 14 Jan 2011 19:57:06 +0000 (-0800)
Subject: x86, olpc: Add missing Kconfig dependencies
X-Git-Tag: v2.6.38-rc1~37^3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9;p=~emulex%2Finfiniband.git

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
---

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.