aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-01-08 04:05:09 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 23:14:08 -0500
commit987d4613e52e4f655278265aabbcc69237018b1d (patch)
tree4190d1488573764e871c3299bac0624858ec3a19 /arch
parent9fe656e91fd95d0893cc4831b032e0be60791bd7 (diff)
[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: Dave Jones <davej@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/Kconfig2
-rw-r--r--arch/i386/kernel/apm.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 486449e9e710..810ba8c37a5f 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -699,7 +699,7 @@ depends on PM && !X86_VISWS
699 699
700config APM 700config APM
701 tristate "APM (Advanced Power Management) BIOS support" 701 tristate "APM (Advanced Power Management) BIOS support"
702 depends on PM && PM_LEGACY 702 depends on PM
703 ---help--- 703 ---help---
704 APM is a BIOS specification for saving power using several different 704 APM is a BIOS specification for saving power using several different
705 techniques. This is mostly useful for battery powered laptops with 705 techniques. This is mostly useful for battery powered laptops with
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index 2d793d4aef1a..9d8827156e54 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -2291,7 +2291,9 @@ static int __init apm_init(void)
2291 apm_info.disabled = 1; 2291 apm_info.disabled = 1;
2292 return -ENODEV; 2292 return -ENODEV;
2293 } 2293 }
2294#ifdef CONFIG_PM_LEGACY
2294 pm_active = 1; 2295 pm_active = 1;
2296#endif
2295 2297
2296 /* 2298 /*
2297 * Set up a segment that references the real mode segment 0x40 2299 * Set up a segment that references the real mode segment 0x40
@@ -2382,7 +2384,9 @@ static void __exit apm_exit(void)
2382 exit_kapmd = 1; 2384 exit_kapmd = 1;
2383 while (kapmd_running) 2385 while (kapmd_running)
2384 schedule(); 2386 schedule();
2387#ifdef CONFIG_PM_LEGACY
2385 pm_active = 0; 2388 pm_active = 0;
2389#endif
2386} 2390}
2387 2391
2388module_init(apm_init); 2392module_init(apm_init);