This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / linux / pm.h

diff --git a/include/linux/pm.h b/include/linux/pm.h
index 3017bde..6446e4f 100644 (file)
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -143,11 +143,6 @@ int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data);
  */
 int pm_send_all(pm_request_t rqst, void *data);
 
-/*
- * Find a device
- */
-struct pm_dev *pm_find(pm_dev_t type, struct pm_dev *from);
-
 static inline void pm_access(struct pm_dev *dev) {}
 static inline void pm_dev_idle(struct pm_dev *dev) {}
 
@@ -159,7 +154,7 @@ static inline struct pm_dev *pm_register(pm_dev_t type,
                                         unsigned long id,
                                         pm_callback callback)
 {
-       return 0;
+       return NULL;
 }
 
 static inline void pm_unregister(struct pm_dev *dev) {}
@@ -194,11 +189,12 @@ extern void (*pm_idle)(void);
 extern void (*pm_power_off)(void);
 
 enum {
-       PM_SUSPEND_ON,
-       PM_SUSPEND_STANDBY,
-       PM_SUSPEND_MEM,
-       PM_SUSPEND_DISK,
-       PM_SUSPEND_MAX,
+       PM_SUSPEND_ON = 0,
+       PM_SUSPEND_STANDBY = 1,
+       /* NOTE: PM_SUSPEND_MEM == PCI_D3hot */
+       PM_SUSPEND_MEM = 3,
+       PM_SUSPEND_DISK = 4,
+       PM_SUSPEND_MAX = 5,
 };
 
 enum {
@@ -229,8 +225,9 @@ extern int pm_suspend(u32 state);
 struct device;
 
 struct dev_pm_info {
-#ifdef CONFIG_PM
        u32                     power_state;
+#ifdef CONFIG_PM
+       u32                     prev_state;
        u8                      * saved_state;
        atomic_t                pm_users;
        struct device           * pm_parent;