[GIT PULL 0/12] ARM: soc: updates for 3.7, first batch

[Olof Johansson]

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 at 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 at 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 at lixom.net>
Cc: Tony Lindgren <tony at 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