aboutsummaryrefslogtreecommitdiff
path: root/drivers/regulator/tps65023-regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-23 18:50:59 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-23 18:50:59 +0000
commit924ee2c9621b65df9dffa8218af5ee9a9b892bba (patch)
tree316d72848181d4198dad3407ba5441083708ab7e /drivers/regulator/tps65023-regulator.c
parent68aaa37d0e8232d62a7e9411699e0dc005750186 (diff)
parent69511a452e6dc6b74fe4f3671a51b1b44b9c57e3 (diff)
downloadlinaro-lsk-924ee2c9621b65df9dffa8218af5ee9a9b892bba.tar.gz
Merge remote-tracking branch 'regulator/topic/dt' into regulator-next
Diffstat (limited to 'drivers/regulator/tps65023-regulator.c')
-rw-r--r--drivers/regulator/tps65023-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c
index e0bcd75a7cc..18d61a0529a 100644
--- a/drivers/regulator/tps65023-regulator.c
+++ b/drivers/regulator/tps65023-regulator.c
@@ -473,7 +473,7 @@ static int __devinit tps_65023_probe(struct i2c_client *client,
/* Register the regulators */
rdev = regulator_register(&tps->desc[i], &client->dev,
- init_data, tps);
+ init_data, tps, NULL);
if (IS_ERR(rdev)) {
dev_err(&client->dev, "failed to register %s\n",
id->name);