projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[powerpc.git]
/
drivers
/
acpi
/
bus.c
diff --git
a/drivers/acpi/bus.c
b/drivers/acpi/bus.c
index
6a4da41
..
606f873
100644
(file)
--- a/
drivers/acpi/bus.c
+++ b/
drivers/acpi/bus.c
@@
-28,6
+28,7
@@
#include <linux/list.h>
#include <linux/sched.h>
#include <linux/pm.h>
#include <linux/list.h>
#include <linux/sched.h>
#include <linux/pm.h>
+#include <linux/pm_legacy.h>
#include <linux/device.h>
#include <linux/proc_fs.h>
#ifdef CONFIG_X86
#include <linux/device.h>
#include <linux/proc_fs.h>
#ifdef CONFIG_X86
@@
-754,7
+755,7
@@
static int __init acpi_init(void)
result = acpi_bus_init();
if (!result) {
result = acpi_bus_init();
if (!result) {
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_LEGACY
if (!PM_IS_ACTIVE())
pm_active = 1;
else {
if (!PM_IS_ACTIVE())
pm_active = 1;
else {