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

Commit 53cb4307 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

Pull a regulator build fix from Mark Brown:
 "Fix a build warning in the anatop driver for 3.4

  This is a trivial rename to stop the build system complaining that
  we're referencing things we shouldn't be."

* tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: anatop: fix 'anatop_regulator' name collision
parents 0682490d c0d78c23

drivers/regulator/anatop-regulator.c

+3 −3
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static struct of_device_id __devinitdata of_anatop_regulator_match_tbl[] = { 
	{ /* end */ }

};



static struct platform_driver anatop_regulator = {

static struct platform_driver anatop_regulator_driver = {

	.driver = {

		.name	= "anatop_regulator",

		.owner  = THIS_MODULE,
@@ -226,13 +226,13 @@ static struct platform_driver anatop_regulator = { 


static int __init anatop_regulator_init(void)

{

	return platform_driver_register(&anatop_regulator);

	return platform_driver_register(&anatop_regulator_driver);

}

postcore_initcall(anatop_regulator_init);



static void __exit anatop_regulator_exit(void)

{

	platform_driver_unregister(&anatop_regulator);

	platform_driver_unregister(&anatop_regulator_driver);

}

module_exit(anatop_regulator_exit);