diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-07-15 23:59:09 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-07-15 23:59:09 +0200 |
| commit | ba1389d74f34c0c6e95cc135a332cd29c29d9c20 (patch) | |
| tree | 53813843d22cfcfe6d466a5daa44c646f8157980 /kernel/power | |
| parent | f0c077a8b7f9dce590c760a7b2f3c417dffa52d1 (diff) | |
| parent | 5ca80817e231723f1399bff495854ba2171103ca (diff) | |
| download | linux-ba1389d74f34c0c6e95cc135a332cd29c29d9c20.tar.gz linux-ba1389d74f34c0c6e95cc135a332cd29c29d9c20.tar.bz2 linux-ba1389d74f34c0c6e95cc135a332cd29c29d9c20.zip | |
Merge branch 'pm-domains' into for-linus
* pm-domains: (33 commits)
ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active
PM / Domains: Take .power_off() error code into account
ARM / shmobile: Use genpd_queue_power_off_work()
ARM / shmobile: Use pm_genpd_poweroff_unused()
PM / Domains: Introduce function to power off all unused PM domains
PM / Domains: Queue up power off work only if it is not pending
PM / Domains: Improve handling of wakeup devices during system suspend
PM / Domains: Do not restore all devices on power off error
PM / Domains: Allow callbacks to execute all runtime PM helpers
PM / Domains: Do not execute device callbacks under locks
PM / Domains: Make failing pm_genpd_prepare() clean up properly
PM / Domains: Set device state to "active" during system resume
ARM: mach-shmobile: sh7372 A3RV requires A4LC
PM / Domains: Export pm_genpd_poweron() in header
ARM: mach-shmobile: sh7372 late pm domain off
ARM: mach-shmobile: Runtime PM late init callback
ARM: mach-shmobile: sh7372 D4 support
ARM: mach-shmobile: sh7372 A4MP support
ARM: mach-shmobile: sh7372: make sure that fsi is peripheral of spu2
ARM: mach-shmobile: sh7372 A3SG support
...
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/Kconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 87f4d24b55b0..7b856b3458d2 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -224,6 +224,10 @@ config PM_OPP implementations a ready to use framework to manage OPPs. For more information, read <file:Documentation/power/opp.txt> -config PM_RUNTIME_CLK +config PM_CLK def_bool y - depends on PM_RUNTIME && HAVE_CLK + depends on PM && HAVE_CLK + +config PM_GENERIC_DOMAINS + bool + depends on PM |