vserver 1.9.5.x5

[linux-2.6.git] / drivers / base / power / power.h

diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index 6971cc6..e5eda74 100644 (file)
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -27,6 +27,11 @@ extern void device_shutdown(void);
  */
 extern struct semaphore dpm_sem;
 
+/*
+ * Used to serialize changes to the dpm_* lists.
+ */
+extern struct semaphore dpm_list_sem;
+
 /*
  * The PM lists.
  */
@@ -66,14 +71,14 @@ extern int resume_device(struct device *);
 /*
  * suspend.c
  */
-extern int suspend_device(struct device *, u32);
+extern int suspend_device(struct device *, pm_message_t);
 
 
 /*
  * runtime.c
  */
 
-extern int dpm_runtime_suspend(struct device *, u32);
+extern int dpm_runtime_suspend(struct device *, pm_message_t);
 extern void dpm_runtime_resume(struct device *);
 
 #else /* CONFIG_PM */
@@ -88,7 +93,7 @@ static inline void device_pm_remove(struct device * dev)
 
 }
 
-static inline int dpm_runtime_suspend(struct device * dev, u32 state)
+static inline int dpm_runtime_suspend(struct device * dev, pm_message_t state)
 {
        return 0;
 }