diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-26 09:18:37 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-26 09:18:37 -1000 |
| commit | 34a08681832f835269670b1d72e45f48b014375f (patch) | |
| tree | ad1c4ad1e993f8160bf38ee73cef425126f42403 | |
| parent | 6b935ca29562181c8713f19553e6c7743d905fd7 (diff) | |
| parent | ec8da805c43a6cc0252dad0ff6e348c731e0b138 (diff) | |
| download | linux-34a08681832f835269670b1d72e45f48b014375f.tar.gz | |
Merge tag 'regulator-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown: "Fix module loading for tps6586x. A simple one liner fix to make module loading work for distros (product specific kernels tend to have things built in)" * tag 'regulator-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: mfd: tps6586x: correct device name of the regulator cell
| -rw-r--r-- | drivers/mfd/tps6586x.c | 2 | ||||
| -rw-r--r-- | drivers/regulator/tps6586x-regulator.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c index 721b9186a5d1..4b93ed4d5cd6 100644 --- a/drivers/mfd/tps6586x.c +++ b/drivers/mfd/tps6586x.c @@ -107,7 +107,7 @@ static struct mfd_cell tps6586x_cell[] = { .name = "tps6586x-gpio", }, { - .name = "tps6586x-pmic", + .name = "tps6586x-regulator", }, { .name = "tps6586x-rtc", diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c index d8fa37d5c734..2c9155b66f09 100644 --- a/drivers/regulator/tps6586x-regulator.c +++ b/drivers/regulator/tps6586x-regulator.c @@ -439,7 +439,7 @@ static int tps6586x_regulator_remove(struct platform_device *pdev) static struct platform_driver tps6586x_regulator_driver = { .driver = { - .name = "tps6586x-pmic", + .name = "tps6586x-regulator", .owner = THIS_MODULE, }, .probe = tps6586x_regulator_probe, |