diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-17 22:15:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-17 22:15:25 +0200 |
| commit | b4fd4ae6c6420c18e4bae2c294b7e06f5ff5210f (patch) | |
| tree | a948e1f99dbce5d34da04b3e655d3655335848d7 /kernel | |
| parent | mm: fix __page_to_pfn for a const struct page argument (diff) | |
| parent | PM / Domains: Fix build for CONFIG_PM_RUNTIME unset (diff) | |
| download | linux-b4fd4ae6c6420c18e4bae2c294b7e06f5ff5210f.tar.xz linux-b4fd4ae6c6420c18e4bae2c294b7e06f5ff5210f.zip | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / Domains: Fix build for CONFIG_PM_RUNTIME unset
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index b1914cb9095c..3744c594b19b 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -231,3 +231,7 @@ config PM_CLK config PM_GENERIC_DOMAINS bool depends on PM + +config PM_GENERIC_DOMAINS_RUNTIME + def_bool y + depends on PM_RUNTIME && PM_GENERIC_DOMAINS |