From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 19 Sep 2012 14:54:29 +0000 (+0200)
Subject: Merge branch 'drivers/ocp2scp' into next/drivers
X-Git-Tag: firefly_0821_release~3680^2~1960^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=25696b4b3541d5f7641b61e6abfda765426834b8;p=firefly-linux-kernel-4.4.55.git

Merge branch 'drivers/ocp2scp' into next/drivers

Merge patch from Santosh Shilimkar <santosh.shilimkar@ti.com>:

* drivers/ocp2scp:
  drivers: bus: Move the OMAP interconnect driver to drivers/bus/

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

25696b4b3541d5f7641b61e6abfda765426834b8
diff --cc arch/arm/mach-omap2/Kconfig
index fcd4e85c4ddc,7d3c8ab3eca4..728b05eb2964
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -62,7 -63,8 +63,8 @@@ config ARCH_OMAP
  	select PM_OPP if PM
  	select USB_ARCH_HAS_EHCI if USB_SUPPORT
  	select ARM_CPU_SUSPEND if PM
 -	select ARCH_NEEDS_CPU_IDLE_COUPLED
 +	select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP
+ 	select OMAP_INTERCONNECT
  
  config SOC_OMAP5
  	bool "TI OMAP5"