diff options
author | Christian Borntraeger <borntraeger@de.ibm.com> | 2007-08-28 14:58:56 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-08-28 17:12:56 -0400 |
commit | 134c21715ac3cb36db13c8d362cc80ccc87ee48d (patch) | |
tree | 7204b7f1f6ba68daed6b655611ab12e5e23785cd /drivers | |
parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) |
ACPI: (more) delete CONFIG_ACPI_PROCFS_SLEEP (again)
Commit 2bcf9dddeb8e79a4ba55bf191533f70f39ce
('ACPI: delete CONFIG_ACPI_PROCFS_SLEEP (again)')
was incomplete.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/sleep/proc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c index 66b62b0d3609..3839efd5eaea 100644 --- a/drivers/acpi/sleep/proc.c +++ b/drivers/acpi/sleep/proc.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | ACPI_MODULE_NAME("sleep") | 25 | ACPI_MODULE_NAME("sleep") |
26 | #ifdef CONFIG_ACPI_PROCFS_SLEEP | 26 | #ifdef CONFIG_ACPI_PROCFS |
27 | static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset) | 27 | static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset) |
28 | { | 28 | { |
29 | int i; | 29 | int i; |
@@ -76,7 +76,7 @@ acpi_system_write_sleep(struct file *file, | |||
76 | Done: | 76 | Done: |
77 | return error ? error : count; | 77 | return error ? error : count; |
78 | } | 78 | } |
79 | #endif /* CONFIG_ACPI_PROCFS_SLEEP */ | 79 | #endif /* CONFIG_ACPI_PROCFS */ |
80 | 80 | ||
81 | #if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || !defined(CONFIG_X86) | 81 | #if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || !defined(CONFIG_X86) |
82 | /* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */ | 82 | /* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */ |
@@ -471,7 +471,7 @@ static const struct file_operations acpi_system_wakeup_device_fops = { | |||
471 | .release = single_release, | 471 | .release = single_release, |
472 | }; | 472 | }; |
473 | 473 | ||
474 | #ifdef CONFIG_ACPI_PROCFS_SLEEP | 474 | #ifdef CONFIG_ACPI_PROCFS |
475 | static const struct file_operations acpi_system_sleep_fops = { | 475 | static const struct file_operations acpi_system_sleep_fops = { |
476 | .open = acpi_system_sleep_open_fs, | 476 | .open = acpi_system_sleep_open_fs, |
477 | .read = seq_read, | 477 | .read = seq_read, |
@@ -479,7 +479,7 @@ static const struct file_operations acpi_system_sleep_fops = { | |||
479 | .llseek = seq_lseek, | 479 | .llseek = seq_lseek, |
480 | .release = single_release, | 480 | .release = single_release, |
481 | }; | 481 | }; |
482 | #endif /* CONFIG_ACPI_PROCFS_SLEEP */ | 482 | #endif /* CONFIG_ACPI_PROCFS */ |
483 | 483 | ||
484 | #ifdef HAVE_ACPI_LEGACY_ALARM | 484 | #ifdef HAVE_ACPI_LEGACY_ALARM |
485 | static const struct file_operations acpi_system_alarm_fops = { | 485 | static const struct file_operations acpi_system_alarm_fops = { |
@@ -506,7 +506,7 @@ static int __init acpi_sleep_proc_init(void) | |||
506 | if (acpi_disabled) | 506 | if (acpi_disabled) |
507 | return 0; | 507 | return 0; |
508 | 508 | ||
509 | #ifdef CONFIG_ACPI_PROCFS_SLEEP | 509 | #ifdef CONFIG_ACPI_PROCFS |
510 | /* 'sleep' [R/W] */ | 510 | /* 'sleep' [R/W] */ |
511 | entry = | 511 | entry = |
512 | create_proc_entry("sleep", S_IFREG | S_IRUGO | S_IWUSR, | 512 | create_proc_entry("sleep", S_IFREG | S_IRUGO | S_IWUSR, |