Merge branch 'pm-domains'

rafaeljw · rafaeljw · commit 932680692aeb · 2016-01-12T01:11:35.000+01:00
* pm-domains:
  PM / Domains: export symbols to add/remove devices from genpd
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
@@ -1263,6 +1263,7 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
 
 	return ret;
 }
+EXPORT_SYMBOL_GPL(__pm_genpd_add_device);
 
 /**
  * pm_genpd_remove_device - Remove a device from an I/O PM domain.
@@ -1313,6 +1314,7 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd,
 
 	return ret;
 }
+EXPORT_SYMBOL_GPL(pm_genpd_remove_device);
 
 /**
  * pm_genpd_add_subdomain - Add a subdomain to an I/O PM domain.

Original file line number	Diff line number	Diff line change
`@@ -1263,6 +1263,7 @@ int __pm_genpd_add_device(struct generic_pm_domain genpd, struct device dev,`
`1263`	`1263`
`1264`	`1264`	`return ret;`
`1265`	`1265`	`}`
	`1266`	`+EXPORT_SYMBOL_GPL(__pm_genpd_add_device);`
`1266`	`1267`
`1267`	`1268`	`/**`
`1268`	`1269`	`* pm_genpd_remove_device - Remove a device from an I/O PM domain.`
`@@ -1313,6 +1314,7 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd,`
`1313`	`1314`
`1314`	`1315`	`return ret;`
`1315`	`1316`	`}`
	`1317`	`+EXPORT_SYMBOL_GPL(pm_genpd_remove_device);`
`1316`	`1318`
`1317`	`1319`	`/**`
`1318`	`1320`	`* pm_genpd_add_subdomain - Add a subdomain to an I/O PM domain.`