diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 19:29:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 19:29:55 -0500 |
| commit | 92118c739df879497b8cc5a2eb3a9dc255f01b20 (patch) | |
| tree | da556ca2f8afa1b43ca0626c9426f6634c64d32d /drivers/base/power/suspend.c | |
| parent | b4669d66fb1488fd9cebe0b8da447cfeb86109ba (diff) | |
| parent | 276e0c75f1e9a8b34b7b19e8fe188be958d420dd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/base/power/suspend.c')
| -rw-r--r-- | drivers/base/power/suspend.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c index 50501764d050..8660779fb288 100644 --- a/drivers/base/power/suspend.c +++ b/drivers/base/power/suspend.c | |||
| @@ -9,10 +9,9 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 12 | #include "../base.h" | ||
| 12 | #include "power.h" | 13 | #include "power.h" |
| 13 | 14 | ||
| 14 | extern int sysdev_suspend(pm_message_t state); | ||
| 15 | |||
| 16 | /* | 15 | /* |
| 17 | * The entries in the dpm_active list are in a depth first order, simply | 16 | * The entries in the dpm_active list are in a depth first order, simply |
| 18 | * because children are guaranteed to be discovered after parents, and | 17 | * because children are guaranteed to be discovered after parents, and |