Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / base / power / power.h

diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index c0bd03c83b9cad1dbbb9341aa70f13e85b520760..698dde74258792544098eb8866e77ee72303c865 100644 (file)
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -34,6 +34,7 @@ extern void device_pm_move_last(struct device *);
 
 static inline void device_pm_init(struct device *dev)
 {
+       spin_lock_init(&dev->power.lock);
        pm_runtime_init(dev);
 }
 
@@ -59,6 +60,7 @@ static inline void device_pm_move_last(struct device *dev) {}
 
 extern int dpm_sysfs_add(struct device *);
 extern void dpm_sysfs_remove(struct device *);
+extern void rpm_sysfs_remove(struct device *);
 
 #else /* CONFIG_PM */