aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sleep/proc.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-07-28 03:33:16 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-29 19:53:59 -0400
commit673d5b43daa00b42759cecc6b0760b8bf6be80d2 (patch)
treea795ee922db699a8b4cb893ef5809399f1591ba6 /drivers/acpi/sleep/proc.c
parent296699de6bdc717189a331ab6bbe90e05c94db06 (diff)
ACPI: restore CONFIG_ACPI_SLEEP
Restore the 2.6.22 CONFIG_ACPI_SLEEP build option, but now shadowing the new CONFIG_PM_SLEEP option. Signed-off-by: Len Brown <len.brown@intel.com> [ Modified to work with the PM config setup changes. ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/acpi/sleep/proc.c')
-rw-r--r--drivers/acpi/sleep/proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index 5dfe8b789633..66b62b0d3609 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -78,7 +78,7 @@ acpi_system_write_sleep(struct file *file,
78} 78}
79#endif /* CONFIG_ACPI_PROCFS_SLEEP */ 79#endif /* CONFIG_ACPI_PROCFS_SLEEP */
80 80
81#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) 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 */
83#else 83#else
84#define HAVE_ACPI_LEGACY_ALARM 84#define HAVE_ACPI_LEGACY_ALARM