diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-25 01:35:25 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-25 01:35:25 -0400 |
| commit | 1e1f3f24cdbc53e67acd7b2e37e6cf0cb11bd13c (patch) | |
| tree | f2f8e838d36722d39d62eb7eec7a1b3ad29d0d5a /kernel/sysctl.c | |
| parent | c30c620ee1cc351bcc149c4280e1166998df0064 (diff) | |
| parent | e8b2fd01228f690c3e0cb3f14facfa8d93d4adae (diff) | |
Pull kconfig into release branch
Diffstat (limited to 'kernel/sysctl.c')
| -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 ddebf3f2affe..eb26f2ba51ed 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 | #ifdef CONFIG_ACPI_SLEEP | 692 | #if defined(CONFIG_ACPI) && 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", |