xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next

Browse Source 
Conflicts:
	drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)
This commit is contained in:
Mark Brown
2012-05-12 11:10:25 +01:00
parent 178e43aef2 411a2df509
commit 5949a7e9ab
33 changed files with 559 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/regulator/da9052-regulator.c
View File

@@ -20,6 +20,7 @@
#include <linux/regulator/driver.h>
#include <linux/regulator/machine.h>
#ifdef CONFIG_OF
#include <linux/of.h>
#include <linux/regulator/of_regulator.h>
#endif
@@ -393,7 +394,7 @@ static int __devinit da9052_regulator_probe(struct platform_device *pdev)
if (!nproot)
return -ENODEV;
for (np = of_get_next_child(nproot, NULL); !np;
for (np = of_get_next_child(nproot, NULL); np;
np = of_get_next_child(nproot, np)) {
if (!of_node_cmp(np->name,
regulator->info->reg_desc.name)) {