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 /drivers/mfd/tps6586x.c | |
| parent | 6b935ca29562181c8713f19553e6c7743d905fd7 (diff) | |
| parent | ec8da805c43a6cc0252dad0ff6e348c731e0b138 (diff) | |
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
Diffstat (limited to 'drivers/mfd/tps6586x.c')
| -rw-r--r-- | drivers/mfd/tps6586x.c | 2 |
1 files changed, 1 insertions, 1 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", |