diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-13 19:06:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:14:10 -0500 |
| commit | bca73e4bf8563d83f7856164caa44d5f42e44cca (patch) | |
| tree | ea8c50adca509c8012aed715d578b6c927f9e284 /drivers/acpi | |
| parent | 95e861db3eaba7bc99f8605db70103ec3d078203 (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 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/bus.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 6a4da417c16b..606f8733a776 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/list.h> | 28 | #include <linux/list.h> |
| 29 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
| 30 | #include <linux/pm.h> | 30 | #include <linux/pm.h> |
| 31 | #include <linux/pm_legacy.h> | ||
| 31 | #include <linux/device.h> | 32 | #include <linux/device.h> |
| 32 | #include <linux/proc_fs.h> | 33 | #include <linux/proc_fs.h> |
| 33 | #ifdef CONFIG_X86 | 34 | #ifdef CONFIG_X86 |
| @@ -754,7 +755,7 @@ static int __init acpi_init(void) | |||
| 754 | result = acpi_bus_init(); | 755 | result = acpi_bus_init(); |
| 755 | 756 | ||
| 756 | if (!result) { | 757 | if (!result) { |
| 757 | #ifdef CONFIG_PM | 758 | #ifdef CONFIG_PM_LEGACY |
| 758 | if (!PM_IS_ACTIVE()) | 759 | if (!PM_IS_ACTIVE()) |
| 759 | pm_active = 1; | 760 | pm_active = 1; |
| 760 | else { | 761 | else { |