vserver 1.9.3

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

diff --git a/include/linux/pm.h b/include/linux/pm.h
index 66e62c0..7bfd2d4 100644 (file)
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -159,7 +159,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 +194,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 {