summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:11:41 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:11:41 +0100
commit6c7bdf8e6300bc9e39d41e7dce651bb3f2503e32 (patch)
tree6995b1e6cb37eea7a8550f74760acaebf316a119 /drivers/regulator
parent07afa93e3190b16d14afa0cd6a208ef21f157e6e (diff)
parent4932e89d75f7b946d2f03a0157b8b9f6a0e12e10 (diff)
downloadlinux-6c7bdf8e6300bc9e39d41e7dce651bb3f2503e32.tar.bz2
Merge remote-tracking branch 'regulator/topic/tps6105x' into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/tps6105x-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c
index e0e818d89f46..c1e33a3d397b 100644
--- a/drivers/regulator/tps6105x-regulator.c
+++ b/drivers/regulator/tps6105x-regulator.c
@@ -137,7 +137,7 @@ static int tps6105x_regulator_probe(struct platform_device *pdev)
/* This instance is not set for regulator mode so bail out */
if (pdata->mode != TPS6105X_MODE_VOLTAGE) {
dev_info(&pdev->dev,
- "chip not in voltage mode mode, exit probe \n");
+ "chip not in voltage mode mode, exit probe\n");
return 0;
}