diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-17 16:15:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-17 16:15:25 -0400 |
| commit | b4fd4ae6c6420c18e4bae2c294b7e06f5ff5210f (patch) | |
| tree | a948e1f99dbce5d34da04b3e655d3655335848d7 /kernel | |
| parent | aa462abe8aaf2198d6aef97da20c874ac694a39f (diff) | |
| parent | 17f2ae7f677f023997e02fd2ebabd90ea2a0390d (diff) | |
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 | |||
| 231 | config PM_GENERIC_DOMAINS | 231 | config PM_GENERIC_DOMAINS |
| 232 | bool | 232 | bool |
| 233 | depends on PM | 233 | depends on PM |
| 234 | |||
| 235 | config PM_GENERIC_DOMAINS_RUNTIME | ||
| 236 | def_bool y | ||
| 237 | depends on PM_RUNTIME && PM_GENERIC_DOMAINS | ||