From 9a70bc161242b1c01a5ca2474d6d1984e24f011f Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Tue, 5 Jun 2012 18:10:10 +0800 Subject: [PATCH] --- yaml --- r: 310650 b: refs/heads/master c: 61663171bea0ccb499f0818234c5be7ea6c4c791 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/max8649.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d3ecb81ceb3d..45f9de0beea6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0e4d7bf8b5704904a5d138d81a8ec8b7145767f +refs/heads/master: 61663171bea0ccb499f0818234c5be7ea6c4c791 diff --git a/trunk/drivers/regulator/max8649.c b/trunk/drivers/regulator/max8649.c index 1f4bb80457b3..9d540cd02dab 100644 --- a/trunk/drivers/regulator/max8649.c +++ b/trunk/drivers/regulator/max8649.c @@ -259,6 +259,7 @@ static int __devinit max8649_regulator_probe(struct i2c_client *client, config.dev = &client->dev; config.init_data = pdata->regulator; config.driver_data = info; + config.regmap = info->regmap; info->regulator = regulator_register(&dcdc_desc, &config); if (IS_ERR(info->regulator)) {