summaryrefslogtreecommitdiffstats
path: root/include/linux/pm.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
commit8624512aa908741ba2795200133eae0d7f4557ea (patch)
treed5d3036fccf2604f4c98dedc11e8adb929d6b52e /include/linux/pm.h
parent7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff)
Merge with 2.3.48.
Diffstat (limited to 'include/linux/pm.h')
-rw-r--r--include/linux/pm.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 3f73f489f..4d0a950a9 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -101,6 +101,7 @@ struct pm_dev
unsigned long flags;
int state;
+ int prev_state;
struct list_head entry;
};
@@ -129,9 +130,14 @@ void pm_unregister(struct pm_dev *dev);
void pm_unregister_all(pm_callback callback);
/*
+ * Send a request to a single device
+ */
+int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data);
+
+/*
* Send a request to all devices
*/
-int pm_send_request(pm_request_t rqst, void *data);
+int pm_send_all(pm_request_t rqst, void *data);
/*
* Find a device
@@ -156,7 +162,12 @@ extern inline void pm_unregister(struct pm_dev *dev) {}
extern inline void pm_unregister_all(pm_callback callback) {}
-extern inline int pm_send_request(pm_request_t rqst, void *data)
+extern inline int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data)
+{
+ return 0;
+}
+
+extern inline int pm_send_all(pm_request_t rqst, void *data)
{
return 0;
}