summaryrefslogtreecommitdiffstats
path: root/drivers/base/power/suspend.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 01:29:55 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 01:29:55 +0100
commit92118c739df879497b8cc5a2eb3a9dc255f01b20 (patch)
treeda556ca2f8afa1b43ca0626c9426f6634c64d32d /drivers/base/power/suspend.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff)
parent[PATCH] debugfs: trivial comment fix (diff)
downloadlinux-92118c739df879497b8cc5a2eb3a9dc255f01b20.tar.xz
linux-92118c739df879497b8cc5a2eb3a9dc255f01b20.zip
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.c3
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 @@
*/
#include <linux/device.h>
+#include "../base.h"
#include "power.h"
-extern int sysdev_suspend(pm_message_t state);
-
/*
* The entries in the dpm_active list are in a depth first order, simply
* because children are guaranteed to be discovered after parents, and