diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 22:43:29 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 22:43:29 -0500 |
| commit | 21e55ca4060e5a3891ab72cbbc5d6c85e3036049 (patch) | |
| tree | bf2b7f4111987905b03b117c93ba03f7b03ad089 /drivers/regulator | |
| parent | 41f5983236006f12692c2e62ebb1fbfa1be7c6a3 (diff) | |
| parent | 10835600cf8f3459cb4420fc2a6b9f57bad15307 (diff) | |
Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/tps6586x-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c index 9ce44109f2aa..f86da672c758 100644 --- a/drivers/regulator/tps6586x-regulator.c +++ b/drivers/regulator/tps6586x-regulator.c | |||
| @@ -389,7 +389,7 @@ static int tps6586x_regulator_probe(struct platform_device *pdev) | |||
| 389 | int id; | 389 | int id; |
| 390 | int err; | 390 | int err; |
| 391 | 391 | ||
| 392 | dev_dbg(&pdev->dev, "Probing regulator %d\n", id); | 392 | dev_dbg(&pdev->dev, "Probing regulator\n"); |
| 393 | 393 | ||
| 394 | pdata = dev_get_platdata(pdev->dev.parent); | 394 | pdata = dev_get_platdata(pdev->dev.parent); |
| 395 | if ((!pdata) && (pdev->dev.parent->of_node)) | 395 | if ((!pdata) && (pdev->dev.parent->of_node)) |