Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34a08681 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6b935ca2 ec8da805

drivers/mfd/tps6586x.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static struct mfd_cell tps6586x_cell[] = { 
		.name = "tps6586x-gpio",

	},

	{

		.name = "tps6586x-pmic",

		.name = "tps6586x-regulator",

	},

	{

		.name = "tps6586x-rtc",

drivers/regulator/tps6586x-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -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,