[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9@git.kernel.org>
Date: Fri, 14 Jan 2011 23:49:14 GMT
From: "tip-bot for H. Peter Anvin" <hpa@...ux.intel.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, grant.likely@...retlab.ca,
hpa@...or.com, mingo@...hat.com, dsd@...top.org,
dilinger@...ued.net, tglx@...utronix.de, hpa@...ux.intel.com
Subject: [tip:x86/urgent] x86, olpc: Add missing Kconfig dependencies
Commit-ID: 76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9
Gitweb: http://git.kernel.org/tip/76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9
Author: H. Peter Anvin <hpa@...ux.intel.com>
AuthorDate: Fri, 14 Jan 2011 11:57:06 -0800
Committer: H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Fri, 14 Jan 2011 11:57:06 -0800
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@...ux.intel.com>
Cc: Daniel Drake <dsd@...top.org>
Cc: Andres Salomon <dilinger@...ued.net>
Cc: Grant Likely <grant.likely@...retlab.ca>
LKML-Reference: <20100923162846.D8D409D401B@....reactivated.net>
Cc: <stable@...nel.org> 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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists