Merge branches 'pm-domains', 'powercap' and 'pm-tools'

[cascardo/linux.git] / drivers / base / power / domain.c

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 6a103a3..0d8780c 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2088,7 +2088,7 @@ EXPORT_SYMBOL_GPL(of_genpd_del_provider);
  * Returns a valid pointer to struct generic_pm_domain on success or ERR_PTR()
  * on failure.
  */
  * Returns a valid pointer to struct generic_pm_domain on success or ERR_PTR()
  * on failure.
  */

-static struct generic_pm_domain *of_genpd_get_from_provider(
+struct generic_pm_domain *of_genpd_get_from_provider(

                                        struct of_phandle_args *genpdspec)
 {
        struct generic_pm_domain *genpd = ERR_PTR(-ENOENT);
                                        struct of_phandle_args *genpdspec)
 {
        struct generic_pm_domain *genpd = ERR_PTR(-ENOENT);


@@ -2108,6 +2108,7 @@ static struct generic_pm_domain *of_genpd_get_from_provider(
 
        return genpd;
 }
 
        return genpd;
 }

+EXPORT_SYMBOL_GPL(of_genpd_get_from_provider);

 
 /**
  * genpd_dev_pm_detach - Detach a device from its PM domain.
 
 /**
  * genpd_dev_pm_detach - Detach a device from its PM domain.