diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-13 16:06:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 18:14:10 -0800 |
commit | bca73e4bf8563d83f7856164caa44d5f42e44cca (patch) | |
tree | ea8c50adca509c8012aed715d578b6c927f9e284 /arch/i386 | |
parent | 95e861db3eaba7bc99f8605db70103ec3d078203 (diff) | |
download | op-kernel-dev-bca73e4bf8563d83f7856164caa44d5f42e44cca.zip op-kernel-dev-bca73e4bf8563d83f7856164caa44d5f42e44cca.tar.gz |
[PATCH] move pm_register/etc. to CONFIG_PM_LEGACY, pm_legacy.h
Since few people need the support anymore, this moves the legacy
pm_xxx functions to CONFIG_PM_LEGACY, and include/linux/pm_legacy.h.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/Kconfig | 2 | ||||
-rw-r--r-- | arch/i386/kernel/apm.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index dbf90ad..6004bb0 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig @@ -699,7 +699,7 @@ depends on PM && !X86_VISWS config APM tristate "APM (Advanced Power Management) BIOS support" - depends on PM + depends on PM && PM_LEGACY ---help--- APM is a BIOS specification for saving power using several different 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 003548b..1e60acb 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c @@ -218,6 +218,7 @@ #include <linux/time.h> #include <linux/sched.h> #include <linux/pm.h> +#include <linux/pm_legacy.h> #include <linux/device.h> #include <linux/kernel.h> #include <linux/smp.h> |