dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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

This commit is contained in:
Mark Brown 2012-12-10 12:43:29 +09:00
parent 41f5983236 10835600cf
commit 21e55ca406
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/tps6586x-regulator.c
View File

@ -389,7 +389,7 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
int id;
int err;
dev_dbg(&pdev->dev, "Probing regulator %d\n", id);
dev_dbg(&pdev->dev, "Probing regulator\n");
pdata = dev_get_platdata(pdev->dev.parent);
if ((!pdata) && (pdev->dev.parent->of_node))