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>

diff --cc arch/arm/mach-omap2/Kconfig
index fcd4e85c4ddcce66921a83b29e45669c50704918,7d3c8ab3eca4c2d3dd79147ab42e629e0bc179c6..728b05eb2964933ee52a9a09c23d679b8c98a42a
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/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"