lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2012-04-10 10:26:41 -07:00
parent 0682490d5f c0d78c2342
commit 53cb430755
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/regulator/anatop-regulator.c
View File

@@ -214,7 +214,7 @@ static struct of_device_id __devinitdata of_anatop_regulator_match_tbl[] = {
{ /* end */ } { /* end */ }
}; };
static struct platform_driver anatop_regulator = { static struct platform_driver anatop_regulator_driver = {
.driver = { .driver = {
.name = "anatop_regulator", .name = "anatop_regulator",
.owner = THIS_MODULE, .owner = THIS_MODULE,
@@ -226,13 +226,13 @@ static struct platform_driver anatop_regulator = {
static int __init anatop_regulator_init(void) 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); postcore_initcall(anatop_regulator_init);
static void __exit anatop_regulator_exit(void) static void __exit anatop_regulator_exit(void)
{ {
platform_driver_unregister(&anatop_regulator); platform_driver_unregister(&anatop_regulator_driver);
} }
module_exit(anatop_regulator_exit); module_exit(anatop_regulator_exit);