git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
linux
/
pm.h
diff --git
a/include/linux/pm.h
b/include/linux/pm.h
index
658c1b9
..
5be87ba
100644
(file)
--- a/
include/linux/pm.h
+++ b/
include/linux/pm.h
@@
-23,6
+23,7
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
+#include <linux/config.h>
#include <linux/list.h>
#include <asm/atomic.h>
#include <linux/list.h>
#include <asm/atomic.h>
@@
-187,8
+188,6
@@
extern void device_power_up(void);
extern void device_resume(void);
#ifdef CONFIG_PM
extern void device_resume(void);
#ifdef CONFIG_PM
-extern suspend_disk_method_t pm_disk_mode;
-
extern int device_suspend(pm_message_t state);
#define device_set_wakeup_enable(dev,val) \
extern int device_suspend(pm_message_t state);
#define device_set_wakeup_enable(dev,val) \
@@
-198,12
+197,6
@@
extern int device_suspend(pm_message_t state);
extern int dpm_runtime_suspend(struct device *, pm_message_t);
extern void dpm_runtime_resume(struct device *);
extern int dpm_runtime_suspend(struct device *, pm_message_t);
extern void dpm_runtime_resume(struct device *);
-extern void __suspend_report_result(const char *function, void *fn, int ret);
-
-#define suspend_report_result(fn, ret) \
- do { \
- __suspend_report_result(__FUNCTION__, fn, ret); \
- } while (0)
#else /* !CONFIG_PM */
#else /* !CONFIG_PM */
@@
-222,9
+215,8
@@
static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state)
static inline void dpm_runtime_resume(struct device * dev)
{
static inline void dpm_runtime_resume(struct device * dev)
{
-}
-#define suspend_report_result(fn, ret) do { } while (0)
+}
#endif
#endif