summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 03:43:29 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 03:43:29 (GMT)
commit21e55ca4060e5a3891ab72cbbc5d6c85e3036049 (patch)
treebf2b7f4111987905b03b117c93ba03f7b03ad089 /drivers/regulator
parent41f5983236006f12692c2e62ebb1fbfa1be7c6a3 (diff)
parent10835600cf8f3459cb4420fc2a6b9f57bad15307 (diff)
downloadlinux-21e55ca4060e5a3891ab72cbbc5d6c85e3036049.tar.xz
Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/tps6586x-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index 9ce4410..f86da67 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)
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))