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

[PATCH] Make apm buildable without legacy pm

Browse Source 
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: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Dave Jones
2006-01-08 01:05:09 -08:00
committed by Linus Torvalds
parent 9fe656e91f
commit 987d4613e5
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/i386/Kconfig
View File

@@ -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

4
arch/i386/kernel/apm.c
View File

@@ -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)
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);