aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-13 19:06:25 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-13 21:14:10 -0500
commitbca73e4bf8563d83f7856164caa44d5f42e44cca (patch)
treeea8c50adca509c8012aed715d578b6c927f9e284 /arch
parent95e861db3eaba7bc99f8605db70103ec3d078203 (diff)
[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')
-rw-r--r--arch/arm/kernel/apm.c1
-rw-r--r--arch/frv/kernel/pm.c1
-rw-r--r--arch/i386/Kconfig2
-rw-r--r--arch/i386/kernel/apm.c1
-rw-r--r--arch/mips/au1000/common/power.c1
5 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/kernel/apm.c b/arch/arm/kernel/apm.c
index b0bbd1e62ebb..a2843be05557 100644
--- a/arch/arm/kernel/apm.c
+++ b/arch/arm/kernel/apm.c
@@ -20,6 +20,7 @@
20#include <linux/apm_bios.h> 20#include <linux/apm_bios.h>
21#include <linux/sched.h> 21#include <linux/sched.h>
22#include <linux/pm.h> 22#include <linux/pm.h>
23#include <linux/pm_legacy.h>
23#include <linux/device.h> 24#include <linux/device.h>
24#include <linux/kernel.h> 25#include <linux/kernel.h>
25#include <linux/list.h> 26#include <linux/list.h>
diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c
index 1a1e8a119c3d..712c3c24c954 100644
--- a/arch/frv/kernel/pm.c
+++ b/arch/frv/kernel/pm.c
@@ -14,6 +14,7 @@
14#include <linux/config.h> 14#include <linux/config.h>
15#include <linux/init.h> 15#include <linux/init.h>
16#include <linux/pm.h> 16#include <linux/pm.h>
17#include <linux/pm_legacy.h>
17#include <linux/sched.h> 18#include <linux/sched.h>
18#include <linux/interrupt.h> 19#include <linux/interrupt.h>
19#include <linux/sysctl.h> 20#include <linux/sysctl.h>
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index dbf90ad6eac3..6004bb0795e0 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 702 depends on PM && PM_LEGACY
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 003548b8735f..1e60acbed3c1 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -218,6 +218,7 @@
218#include <linux/time.h> 218#include <linux/time.h>
219#include <linux/sched.h> 219#include <linux/sched.h>
220#include <linux/pm.h> 220#include <linux/pm.h>
221#include <linux/pm_legacy.h>
221#include <linux/device.h> 222#include <linux/device.h>
222#include <linux/kernel.h> 223#include <linux/kernel.h>
223#include <linux/smp.h> 224#include <linux/smp.h>
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c
index f85093b8d54d..f4926315fb68 100644
--- a/arch/mips/au1000/common/power.c
+++ b/arch/mips/au1000/common/power.c
@@ -32,6 +32,7 @@
32#include <linux/config.h> 32#include <linux/config.h>
33#include <linux/init.h> 33#include <linux/init.h>
34#include <linux/pm.h> 34#include <linux/pm.h>
35#include <linux/pm_legacy.h>
35#include <linux/slab.h> 36#include <linux/slab.h>
36#include <linux/sysctl.h> 37#include <linux/sysctl.h>
37#include <linux/jiffies.h> 38#include <linux/jiffies.h>