aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sleep
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 /drivers/acpi/sleep
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 'drivers/acpi/sleep')
-rw-r--r--drivers/acpi/sleep/main.c6
-rw-r--r--drivers/acpi/sleep/proc.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index ab21357c5c7b..b4e94c893c81 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -202,7 +202,7 @@ static struct pm_ops acpi_pm_ops = {
202 .finish = acpi_pm_finish, 202 .finish = acpi_pm_finish,
203}; 203};
204 204
205#ifdef CONFIG_SOFTWARE_SUSPEND 205#ifdef CONFIG_HIBERNATION
206static int acpi_hibernation_prepare(void) 206static int acpi_hibernation_prepare(void)
207{ 207{
208 return acpi_sleep_prepare(ACPI_STATE_S4); 208 return acpi_sleep_prepare(ACPI_STATE_S4);
@@ -254,7 +254,7 @@ static struct hibernation_ops acpi_hibernation_ops = {
254 .pre_restore = acpi_hibernation_pre_restore, 254 .pre_restore = acpi_hibernation_pre_restore,
255 .restore_cleanup = acpi_hibernation_restore_cleanup, 255 .restore_cleanup = acpi_hibernation_restore_cleanup,
256}; 256};
257#endif /* CONFIG_SOFTWARE_SUSPEND */ 257#endif /* CONFIG_HIBERNATION */
258 258
259/** 259/**
260 * acpi_pm_device_sleep_state - return preferred power state of ACPI device 260 * acpi_pm_device_sleep_state - return preferred power state of ACPI device
@@ -374,7 +374,7 @@ int __init acpi_sleep_init(void)
374 374
375 pm_set_ops(&acpi_pm_ops); 375 pm_set_ops(&acpi_pm_ops);
376 376
377#ifdef CONFIG_SOFTWARE_SUSPEND 377#ifdef CONFIG_HIBERNATION
378 if (sleep_states[ACPI_STATE_S4]) 378 if (sleep_states[ACPI_STATE_S4])
379 hibernation_set_ops(&acpi_hibernation_ops); 379 hibernation_set_ops(&acpi_hibernation_ops);
380#else 380#else
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index ed58e1168aed..1b7bbb5ba623 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -66,7 +66,7 @@ acpi_system_write_sleep(struct file *file,
66 goto Done; 66 goto Done;
67 } 67 }
68 state = simple_strtoul(str, NULL, 0); 68 state = simple_strtoul(str, NULL, 0);
69#ifdef CONFIG_SOFTWARE_SUSPEND 69#ifdef CONFIG_HIBERNATION
70 if (state == 4) { 70 if (state == 4) {
71 error = hibernate(); 71 error = hibernate();
72 goto Done; 72 goto Done;