diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-08 18:57:41 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-08 18:57:41 -0400 |
| commit | fce680e9faaa8acc0ab0a931c5fa823b581cbab0 (patch) | |
| tree | c96026ec637128c21c665a733db5594ebebbb5a4 /arch/arm/plat-omap/Kconfig | |
| parent | 5e090ed7af10729a396a25df43d69a236e789736 (diff) | |
| parent | ce3810cdb4ca31238c87e095d2c494a5eaa4f65d (diff) | |
Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm
OMAP PM related fixes for v3.7-rc
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
| -rw-r--r-- | arch/arm/plat-omap/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index ca83a7659ae..d30f480ccd1 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
| @@ -48,6 +48,7 @@ config OMAP_DEBUG_LEDS | |||
| 48 | config POWER_AVS_OMAP | 48 | config POWER_AVS_OMAP |
| 49 | bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2" | 49 | bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2" |
| 50 | depends on POWER_AVS && (ARCH_OMAP3 || ARCH_OMAP4) && PM | 50 | depends on POWER_AVS && (ARCH_OMAP3 || ARCH_OMAP4) && PM |
| 51 | select POWER_SUPPLY | ||
| 51 | help | 52 | help |
| 52 | Say Y to enable AVS(Adaptive Voltage Scaling) | 53 | Say Y to enable AVS(Adaptive Voltage Scaling) |
| 53 | support on OMAP containing the version 1 or | 54 | support on OMAP containing the version 1 or |