projects
/
cascardo
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2e6185f
0ee7261
)
Merge branch 'drivers/ocp2scp' into next/drivers
author
Arnd Bergmann
<arnd@arndb.de>
Wed, 19 Sep 2012 14:54:29 +0000
(16:54 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Wed, 19 Sep 2012 14:54:29 +0000
(16:54 +0200)
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>
1
2
arch/arm/mach-omap2/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap2/Kconfig
index
fcd4e85
,
7d3c8ab
..
728b05e
---
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"