mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
Merge remote-tracking branch 'regulator/fix/db8500' into tmp
This commit is contained in:
commit
521e2e03b8
1 changed files with 2 additions and 2 deletions
|
@ -528,7 +528,7 @@ static int db8500_regulator_probe(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __exit db8500_regulator_remove(struct platform_device *pdev)
|
static int db8500_regulator_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -553,7 +553,7 @@ static struct platform_driver db8500_regulator_driver = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
},
|
},
|
||||||
.probe = db8500_regulator_probe,
|
.probe = db8500_regulator_probe,
|
||||||
.remove = __exit_p(db8500_regulator_remove),
|
.remove = db8500_regulator_remove,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __init db8500_regulator_init(void)
|
static int __init db8500_regulator_init(void)
|
||||||
|
|
Loading…
Reference in a new issue