Commit 987d4613 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] Make apm buildable without legacy pm

APM doesn't _need_ the PM_LEGACY junk, so remove it's dependancy from
Kconfig, and ifdef the junk in the code.  Whilst the ifdefs are ugly, when
the legacy stuff gets ripped out so will the ifdefs.
Signed-off-by: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9fe656e9
...@@ -699,7 +699,7 @@ depends on PM && !X86_VISWS ...@@ -699,7 +699,7 @@ depends on PM && !X86_VISWS
config APM config APM
tristate "APM (Advanced Power Management) BIOS support" tristate "APM (Advanced Power Management) BIOS support"
depends on PM && PM_LEGACY depends on PM
---help--- ---help---
APM is a BIOS specification for saving power using several different APM is a BIOS specification for saving power using several different
techniques. This is mostly useful for battery powered laptops with techniques. This is mostly useful for battery powered laptops with
......
...@@ -2291,7 +2291,9 @@ static int __init apm_init(void) ...@@ -2291,7 +2291,9 @@ static int __init apm_init(void)
apm_info.disabled = 1; apm_info.disabled = 1;
return -ENODEV; return -ENODEV;
} }
#ifdef CONFIG_PM_LEGACY
pm_active = 1; pm_active = 1;
#endif
/* /*
* Set up a segment that references the real mode segment 0x40 * Set up a segment that references the real mode segment 0x40
...@@ -2382,7 +2384,9 @@ static void __exit apm_exit(void) ...@@ -2382,7 +2384,9 @@ static void __exit apm_exit(void)
exit_kapmd = 1; exit_kapmd = 1;
while (kapmd_running) while (kapmd_running)
schedule(); schedule();
#ifdef CONFIG_PM_LEGACY
pm_active = 0; pm_active = 0;
#endif
} }
module_init(apm_init); module_init(apm_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment