diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-22 11:30:12 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 11:30:12 -0800 |
| commit | c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 (patch) | |
| tree | b2a44e08e9e683078e9d20d6072a513798788314 /arch/arm/mach-omap2/Kconfig | |
| parent | 4931445b94f49672028b81ace9d4eee8ddf19ab2 (diff) | |
| parent | da1f026b532ce944d74461497dc6d8c16456466e (diff) | |
Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 92b004ba5a1..3e8c9e859f9 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -35,6 +35,8 @@ config ARCH_OMAP3 select CPU_V7 select USB_ARCH_HAS_EHCI select ARM_L1_CACHE_SHIFT_6 if !ARCH_OMAP4 + select ARCH_HAS_OPP + select PM_OPP if PM config ARCH_OMAP4 bool "TI OMAP4" @@ -44,6 +46,8 @@ config ARCH_OMAP4 select ARM_GIC select PL310_ERRATA_588369 select ARM_ERRATA_720789 + select ARCH_HAS_OPP + select PM_OPP if PM comment "OMAP Core Type" depends on ARCH_OMAP2 |