git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into next
[sfrench/cifs-2.6.git]
/
include
/
linux
/
pm.h
diff --git
a/include/linux/pm.h
b/include/linux/pm.h
index 24ba5f67b3a3a590480b6ad32b62326be2156c9f..1d4e2d289821d1d74f9e203dc966ed0ed1e5e0ef 100644
(file)
--- a/
include/linux/pm.h
+++ b/
include/linux/pm.h
@@
-400,6
+400,9
@@
extern void __suspend_report_result(const char *function, void *fn, int ret);
#else /* !CONFIG_PM_SLEEP */
#else /* !CONFIG_PM_SLEEP */
+#define device_pm_lock() do {} while (0)
+#define device_pm_unlock() do {} while (0)
+
static inline int device_suspend(pm_message_t state)
{
return 0;
static inline int device_suspend(pm_message_t state)
{
return 0;
@@
-409,6
+412,14
@@
static inline int device_suspend(pm_message_t state)
#endif /* !CONFIG_PM_SLEEP */
#endif /* !CONFIG_PM_SLEEP */
+/* How to reorder dpm_list after device_move() */
+enum dpm_order {
+ DPM_ORDER_NONE,
+ DPM_ORDER_DEV_AFTER_PARENT,
+ DPM_ORDER_PARENT_BEFORE_DEV,
+ DPM_ORDER_DEV_LAST,
+};
+
/*
* Global Power Management flags
* Used to keep APM and ACPI from both being active
/*
* Global Power Management flags
* Used to keep APM and ACPI from both being active