aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-07-29 17:24:36 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-29 19:45:38 -0400
commitb0cb1a19d05b8ea8611a9ef48a17fe417f1832e6 (patch)
tree895fe53e8dc4fc59d05b963ac079f6ff759ad0fb /arch/powerpc
parent6c8dca5d53f95009d4fff00195bf38f277dc4366 (diff)
Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION
Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION to avoid confusion (among other things, with CONFIG_SUSPEND introduced in the next patch). Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/Kconfig.debug2
-rw-r--r--arch/powerpc/configs/lite5200_defconfig2
-rw-r--r--arch/powerpc/configs/pmac32_defconfig2
-rw-r--r--arch/powerpc/kernel/Makefile6
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 5c71624ee38d..22acece95b11 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -20,7 +20,7 @@ config DEBUG_STACK_USAGE
20 20
21config DEBUG_PAGEALLOC 21config DEBUG_PAGEALLOC
22 bool "Debug page memory allocations" 22 bool "Debug page memory allocations"
23 depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND 23 depends on DEBUG_KERNEL && !HIBERNATION
24 help 24 help
25 Unmap pages from the kernel linear mapping after free_pages(). 25 Unmap pages from the kernel linear mapping after free_pages().
26 This results in a large slowdown, but helps to find certain types 26 This results in a large slowdown, but helps to find certain types
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig
index d12a981398b8..9c30ca451617 100644
--- a/arch/powerpc/configs/lite5200_defconfig
+++ b/arch/powerpc/configs/lite5200_defconfig
@@ -196,7 +196,7 @@ CONFIG_PM=y
196# CONFIG_PM_LEGACY is not set 196# CONFIG_PM_LEGACY is not set
197# CONFIG_PM_DEBUG is not set 197# CONFIG_PM_DEBUG is not set
198# CONFIG_PM_SYSFS_DEPRECATED is not set 198# CONFIG_PM_SYSFS_DEPRECATED is not set
199# CONFIG_SOFTWARE_SUSPEND is not set 199# CONFIG_HIBERNATION is not set
200CONFIG_SECCOMP=y 200CONFIG_SECCOMP=y
201# CONFIG_WANT_DEVICE_TREE is not set 201# CONFIG_WANT_DEVICE_TREE is not set
202CONFIG_ISA_DMA_API=y 202CONFIG_ISA_DMA_API=y
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 0d8ba623e29a..08525d6fb1f1 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -218,7 +218,7 @@ CONFIG_PM=y
218CONFIG_PM_DEBUG=y 218CONFIG_PM_DEBUG=y
219# CONFIG_DISABLE_CONSOLE_SUSPEND is not set 219# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
220CONFIG_PM_SYSFS_DEPRECATED=y 220CONFIG_PM_SYSFS_DEPRECATED=y
221CONFIG_SOFTWARE_SUSPEND=y 221CONFIG_HIBERNATION=y
222CONFIG_PM_STD_PARTITION="" 222CONFIG_PM_STD_PARTITION=""
223CONFIG_APM_EMULATION=y 223CONFIG_APM_EMULATION=y
224CONFIG_SECCOMP=y 224CONFIG_SECCOMP=y
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 42c42ecad00c..f39a72f30aad 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -37,9 +37,9 @@ obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o
37obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 37obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
38obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o 38obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
39obj-$(CONFIG_TAU) += tau_6xx.o 39obj-$(CONFIG_TAU) += tau_6xx.o
40obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o suspend.o 40obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o
41obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o 41obj32-$(CONFIG_HIBERNATION) += swsusp_32.o
42obj64-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_64.o swsusp_asm64.o 42obj64-$(CONFIG_HIBERNATION) += swsusp_64.o swsusp_asm64.o
43obj32-$(CONFIG_MODULES) += module_32.o 43obj32-$(CONFIG_MODULES) += module_32.o
44 44
45ifeq ($(CONFIG_PPC_MERGE),y) 45ifeq ($(CONFIG_PPC_MERGE),y)