PM / Domains: Rename struct dev_power_domain to struct dev_pm_domain

[deliverable/linux.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index e4f62d8896b7c9adf3cfb745cbf4c79ec5603d4d..160d4ddb2499c8736cb05e0952703775b94fbb0a 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -516,7 +516,7 @@ struct device_dma_parameters {
  *             minimizes board-specific #ifdefs in drivers.
  * @power:     For device power management.
  *             See Documentation/power/devices.txt for details.
- * @pwr_domain:        Provide callbacks that are executed during system suspend,
+ * @pm_domain: Provide callbacks that are executed during system suspend,
  *             hibernation, system resume and during runtime PM transitions
  *             along with subsystem-level and driver-level callbacks.
  * @numa_node: NUMA node this device is close to.
@@ -567,7 +567,7 @@ struct device {
        void            *platform_data; /* Platform specific data, device
                                           core doesn't touch it */
        struct dev_pm_info      power;
-       struct dev_power_domain *pwr_domain;
+       struct dev_pm_domain    *pm_domain;
 
 #ifdef CONFIG_NUMA
        int             numa_node;      /* NUMA node this device is close to */