diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-28 03:33:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 19:53:59 -0400 |
| commit | 673d5b43daa00b42759cecc6b0760b8bf6be80d2 (patch) | |
| tree | a795ee922db699a8b4cb893ef5809399f1591ba6 /kernel | |
| parent | 296699de6bdc717189a331ab6bbe90e05c94db06 (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 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index eb26f2ba51ed..79c891e6266c 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -689,7 +689,7 @@ static ctl_table kern_table[] = { | |||
| 689 | .proc_handler = &proc_dointvec, | 689 | .proc_handler = &proc_dointvec, |
| 690 | }, | 690 | }, |
| 691 | #endif | 691 | #endif |
| 692 | #if defined(CONFIG_ACPI) && defined(CONFIG_X86) | 692 | #if defined(CONFIG_ACPI_SLEEP) && defined(CONFIG_X86) |
| 693 | { | 693 | { |
| 694 | .ctl_name = KERN_ACPI_VIDEO_FLAGS, | 694 | .ctl_name = KERN_ACPI_VIDEO_FLAGS, |
| 695 | .procname = "acpi_video_flags", | 695 | .procname = "acpi_video_flags", |