aboutsummaryrefslogtreecommitdiff
path: root/arch/i386/kernel/apm.c
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-01-08 01:05:09 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 20:14:08 -0800
commit987d4613e52e4f655278265aabbcc69237018b1d (patch)
tree4190d1488573764e871c3299bac0624858ec3a19 /arch/i386/kernel/apm.c
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/i386/kernel/apm.c')
-rw-r--r--arch/i386/kernel/apm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index 2d793d4aef1..9d8827156e5 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -2291,7 +2291,9 @@ static int __init apm_init(void)
apm_info.disabled = 1;
return -ENODEV;
}
+#ifdef CONFIG_PM_LEGACY
pm_active = 1;
+#endif
/*
* Set up a segment that references the real mode segment 0x40
@@ -2382,7 +2384,9 @@ static void __exit apm_exit(void)
exit_kapmd = 1;
while (kapmd_running)
schedule();
+#ifdef CONFIG_PM_LEGACY
pm_active = 0;
+#endif
}
module_init(apm_init);