summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@nvidia.com>2011-09-29 14:58:04 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:52:30 -0800
commitb6c3e02bb333ad534de0250231d173344897d899 (patch)
treeaef9f512b7b407c140322aa0ec67ca76ce2a5ad1 /drivers/power
parent738f292428dafa2dbfde30b640c6ee914f4cdea5 (diff)
3.0 update tps80031 regulator
See regulator: Remove supply_regulator_dev from machine configuration commit 492c826b9facefa84995f4dea917e301b5ee0884 Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com> Rebase-Id: Rf631c8735735dbc45e3ed53da7de8965490df8d0
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/tps80031-charger.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/power/tps80031-charger.c b/drivers/power/tps80031-charger.c
index 45ea440d8355..3da8eef2e01e 100644
--- a/drivers/power/tps80031-charger.c
+++ b/drivers/power/tps80031-charger.c
@@ -371,7 +371,6 @@ static int tps80031_charger_probe(struct platform_device *pdev)
charger->reg_desc.owner = THIS_MODULE;
charger->reg_init_data.supply_regulator = NULL;
- charger->reg_init_data.supply_regulator_dev = NULL;
charger->reg_init_data.num_consumer_supplies =
pdata->num_consumer_supplies;
charger->reg_init_data.consumer_supplies = pdata->consumer_supplies;