linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 0/12] ARM: soc: updates for 3.7, first batch
Date: Mon, 1 Oct 2012 19:43:06 -0700	[thread overview]
Message-ID: <20121002024306.GA1327@quad.lixom.net> (raw)
In-Reply-To: <CA+55aFzmm=y85k81kAfgiuBb=oaFxi0f83hFb32Y2tTHu1wozw@mail.gmail.com>

On Mon, Oct 01, 2012 at 07:26:26PM -0700, Linus Torvalds wrote:
> On Mon, Oct 1, 2012 at 7:22 PM, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
> >
> > Ok, I've merged them all. As usual, my end result is slightly
> > different from yours, although the differences are pretty small.
> 
> Oh, one more thing: I suspect the OMAP_OCP2SCP config option should
> depend on CONFIG_ARM or something. Just based on the name, I assume it
> doesn't actually work on x86-64, but I see the question..

Ah, yes. It should build fine and not cause breakage, but it's largely
pointless to offer the option. Patch below.


-Olof


>From 5ae0b658cc10af29d7a0a66f2a412a754011ca0e Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Mon, 1 Oct 2012 19:39:33 -0700
Subject: [PATCH] drivers/bus: make ocp2scp depend on OMAP2+

No use in enabling the driver on platforms where it won't be useful.

Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Tony Lindgren <tony@atomide.com>
---
 drivers/bus/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index bbec35d..0f51ed6 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -6,6 +6,7 @@ menu "Bus devices"
 
 config OMAP_OCP2SCP
 	tristate "OMAP OCP2SCP DRIVER"
+	depends on ARCH_OMAP2PLUS
 	help
 	  Driver to enable ocp2scp module which transforms ocp interface
 	  protocol to scp protocol. In OMAP4, USB PHY is connected via
-- 
1.7.10.1.488.g05fbf7a

  reply	other threads:[~2012-10-02  2:43 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-01 23:56 [GIT PULL 0/12] ARM: soc: updates for 3.7, first batch Olof Johansson
2012-10-01 23:56 ` [GIT PULL 1/12] ARM: soc: non-critical bug fixes Olof Johansson
2012-10-01 23:56 ` [GIT PULL 2/12] ARM: soc: general cleanups Olof Johansson
2012-10-01 23:56 ` [GIT PULL 3/12] ARM: soc: MAINTAINERS updates Olof Johansson
2012-10-01 23:56 ` [GIT PULL 4/12] ARM: soc: soc-specific updates Olof Johansson
2012-10-01 23:57 ` [GIT PULL 5/12] ARM: soc: device tree updates Olof Johansson
2012-10-01 23:57 ` [GIT PULL 6/12] ARM: soc: cleanups, part 2 Olof Johansson
2012-10-01 23:57 ` [GIT PULL 7/12] ARM: soc: soc-specific updates, take 2 Olof Johansson
2012-10-01 23:57 ` [GIT PULL 8/12] ARM: soc: driver specific changes Olof Johansson
2012-10-01 23:57 ` [GIT PULL 9/12] ARM: soc: board specific updates Olof Johansson
2012-10-01 23:57 ` [GIT PULL 10/12] ARM: soc: device tree updates, take 2 Olof Johansson
2012-10-01 23:57 ` [GIT PULL 11/12] ARM: soc: documentation updates Olof Johansson
2012-10-01 23:57 ` [GIT PULL 12/12] ARM: soc: multiplatform enablement Olof Johansson
2012-10-02  2:22 ` [GIT PULL 0/12] ARM: soc: updates for 3.7, first batch Linus Torvalds
2012-10-02  2:26   ` Linus Torvalds
2012-10-02  2:43     ` Olof Johansson [this message]
2012-10-02  2:34   ` Olof Johansson
2012-10-02  3:03     ` Tony Lindgren

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=20121002024306.GA1327@quad.lixom.net \
    --to=olof@lixom.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).