lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI: restore CONFIG_ACPI_SLEEP

Browse Source 
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>
This commit is contained in:
Len Brown
2007-07-28 03:33:16 -04:00
committed by Linus Torvalds
parent 296699de6b
commit 673d5b43da
13 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/sleep/proc.c
View File

@ -78,7 +78,7 @@ acpi_system_write_sleep(struct file *file,
}
#endif /* CONFIG_ACPI_PROCFS_SLEEP */
#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE)
#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || !defined(CONFIG_X86)
/* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */
#else
#define HAVE_ACPI_LEGACY_ALARM