All of lore.kernel.org
 help / color / mirror / Atom feed
From: "tip-bot for H. Peter Anvin" <hpa@linux.intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, grant.likely@secretlab.ca,
	hpa@zytor.com, mingo@redhat.com, dsd@laptop.org,
	dilinger@queued.net, tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/urgent] x86, olpc: Add missing Kconfig dependencies
Date: Fri, 14 Jan 2011 23:49:14 GMT	[thread overview]
Message-ID: <tip-76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9@git.kernel.org> (raw)
In-Reply-To: <20100923162846.D8D409D401B@zog.reactivated.net>

Commit-ID:  76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9
Gitweb:     http://git.kernel.org/tip/76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9
Author:     H. Peter Anvin <hpa@linux.intel.com>
AuthorDate: Fri, 14 Jan 2011 11:57:06 -0800
Committer:  H. Peter Anvin <hpa@linux.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@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
---
 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.

      parent reply	other threads:[~2011-01-14 23:49 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-23 16:28 [PATCH 2/2] OLPC: Rework BIOS signature check Daniel Drake
2010-09-23 20:05 ` [tip:x86/olpc] x86, olpc: " tip-bot for Daniel Drake
2010-09-23 23:48 ` [PATCH 2/2] OLPC: " Andres Salomon
2011-01-14 23:49 ` tip-bot for H. Peter Anvin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9@git.kernel.org \
    --to=hpa@linux.intel.com \
    --cc=dilinger@queued.net \
    --cc=dsd@laptop.org \
    --cc=grant.likely@secretlab.ca \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.