diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:50:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:50:19 -0400 |
| commit | df6d3916f3b7b7e2067567a256dd4f0c1ea854a2 (patch) | |
| tree | 0fdeab1ab5d566605fc99aeb5ea3f621f11e7608 /kernel/power | |
| parent | 74add80cbd7fe246c893b93ee75ac59acdd01dd4 (diff) | |
| parent | 197686dfe0038fd190326d118b743ff65ad20c0e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
[POWERPC] Abolish powerpc_flash_init()
[POWERPC] Early serial debug support for PPC44x
[POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
[POWERPC] Add device tree for Ebony
[POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
[POWERPC] MPIC U3/U4 MSI backend
[POWERPC] MPIC MSI allocator
[POWERPC] Enable MSI mappings for MPIC
[POWERPC] Tell Phyp we support MSI
[POWERPC] RTAS MSI implementation
[POWERPC] PowerPC MSI infrastructure
[POWERPC] Rip out the existing powerpc msi stubs
[POWERPC] Remove use of 4level-fixup.h for ppc32
[POWERPC] Add powerpc PCI-E reset API implementation
[POWERPC] Holly bootwrapper
[POWERPC] Holly DTS
[POWERPC] Holly defconfig
[POWERPC] Add support for 750CL Holly board
[POWERPC] Generalize tsi108 PCI setup
[POWERPC] Generalize tsi108 PHY types
...
Fixed conflict in include/asm-powerpc/kdebug.h manually
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 877721708fa4..495b7d4dd330 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig | |||
| @@ -79,7 +79,7 @@ config PM_SYSFS_DEPRECATED | |||
| 79 | 79 | ||
| 80 | config SOFTWARE_SUSPEND | 80 | config SOFTWARE_SUSPEND |
| 81 | bool "Software Suspend (Hibernation)" | 81 | bool "Software Suspend (Hibernation)" |
| 82 | depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)) | 82 | depends on PM && SWAP && (((X86 || PPC64_SWSUSP) && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)) |
| 83 | ---help--- | 83 | ---help--- |
| 84 | Enable the suspend to disk (STD) functionality, which is usually | 84 | Enable the suspend to disk (STD) functionality, which is usually |
| 85 | called "hibernation" in user interfaces. STD checkpoints the | 85 | called "hibernation" in user interfaces. STD checkpoints the |
| @@ -139,7 +139,7 @@ config PM_STD_PARTITION | |||
| 139 | 139 | ||
| 140 | config SUSPEND_SMP | 140 | config SUSPEND_SMP |
| 141 | bool | 141 | bool |
| 142 | depends on HOTPLUG_CPU && X86 && PM | 142 | depends on HOTPLUG_CPU && (X86 || PPC64) && PM |
| 143 | default y | 143 | default y |
| 144 | 144 | ||
| 145 | config APM_EMULATION | 145 | config APM_EMULATION |