diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2012-08-02 20:00:23 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-08-03 14:02:24 -0700 |
| commit | 146c11e900a5ce6b477de86a695cb4bbe5dbc775 (patch) | |
| tree | b5bb5d0392155115b82dba646d9e89755f26dafe | |
| parent | 4b5f13c7b8a277ff1572984fd020bd828f2cceb7 (diff) | |
mfd: tps65090: remove duplicate mfd cells
TPS65090 add mfd sub device of "tps65090-pmic" and
"tps65090-regualtor" which is same.
Remove one of them.
Change-Id: Id02a432cbd240bd9deec9dce6865491afcec6303
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/120840
Reviewed-by: Automatic_Commit_Validation_User
| -rw-r--r-- | drivers/mfd/tps65090.c | 3 | ||||
| -rw-r--r-- | drivers/regulator/tps65090-regulator.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c index 9ca4c44dfc62..a4862c6fc9b5 100644 --- a/drivers/mfd/tps65090.c +++ b/drivers/mfd/tps65090.c @@ -73,9 +73,6 @@ static struct mfd_cell tps65090s[] = { { .name = "tps65910-pmic", }, - { - .name = "tps65910-regulator", - }, }; struct tps65090 { diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c index ebefbf5ea377..82b022dd134d 100644 --- a/drivers/regulator/tps65090-regulator.c +++ b/drivers/regulator/tps65090-regulator.c @@ -230,7 +230,7 @@ static int __devexit tps65090_regulator_remove(struct platform_device *pdev) static struct platform_driver tps65090_regulator_driver = { .driver = { - .name = "tps65090-regulator", + .name = "tps65090-pmic", .owner = THIS_MODULE, }, .probe = tps65090_regulator_probe, |