diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-19 16:54:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-19 16:54:29 +0200 |
| commit | 25696b4b3541d5f7641b61e6abfda765426834b8 (patch) | |
| tree | 49de34c86f67d08b8ee84fba8f05a3e7040d4cac /arch/arm/mach-omap2/Kconfig | |
| parent | 2e6185f1fea6cf88e9ce25cde1d6291ddfb3d4f0 (diff) | |
| parent | 0ee7261c9212dbaf72d510e37f6c5b849d1847f0 (diff) | |
| download | talos-op-linux-25696b4b3541d5f7641b61e6abfda765426834b8.tar.gz talos-op-linux-25696b4b3541d5f7641b61e6abfda765426834b8.zip | |
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>
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index fcd4e85c4ddc..728b05eb2964 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -44,6 +44,7 @@ config ARCH_OMAP3 select ARM_CPU_SUSPEND if PM select MULTI_IRQ_HANDLER select SOC_HAS_OMAP2_SDRC + select OMAP_INTERCONNECT config ARCH_OMAP4 bool "TI OMAP4" @@ -63,6 +64,7 @@ config ARCH_OMAP4 select USB_ARCH_HAS_EHCI if USB_SUPPORT select ARM_CPU_SUSPEND if PM select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP + select OMAP_INTERCONNECT config SOC_OMAP5 bool "TI OMAP5" |
