diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-23 05:04:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-23 05:04:07 -0400 |
| commit | c3144fc46f987413df10e83659f0bf1aad76f79e (patch) | |
| tree | a09f3c13c32664a617d3981ae111436c3127ccc3 /arch/sh/Kconfig | |
| parent | 4f896ffca2b72f4b719746e7fbb0b623252e6ac9 (diff) | |
| parent | cc58f597afc63a57bb55ed97c2a72f7405320c93 (diff) | |
Merge branches 'sh/hwblk' and 'sh/pm-runtime'
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index d17570c61dfd..80b4f9a743a1 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -219,6 +219,8 @@ config CPU_SHX3 | |||
| 219 | config ARCH_SHMOBILE | 219 | config ARCH_SHMOBILE |
| 220 | bool | 220 | bool |
| 221 | select ARCH_SUSPEND_POSSIBLE | 221 | select ARCH_SUSPEND_POSSIBLE |
| 222 | select PM | ||
| 223 | select PM_RUNTIME | ||
| 222 | 224 | ||
| 223 | if SUPERH32 | 225 | if SUPERH32 |
| 224 | 226 | ||