Commit 08aad16c authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branches 'regulator/topic/88pm800',...

Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/ad5398', 'regulator/topic/axp20x' and 'regulator/topic/da9062' into regulator-next
This diff is collapsed.
...@@ -275,4 +275,3 @@ module_exit(ad5398_exit); ...@@ -275,4 +275,3 @@ module_exit(ad5398_exit);
MODULE_DESCRIPTION("AD5398 and AD5821 current regulator driver"); MODULE_DESCRIPTION("AD5398 and AD5821 current regulator driver");
MODULE_AUTHOR("Sonic Zhang"); MODULE_AUTHOR("Sonic Zhang");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("i2c:ad5398-regulator");
...@@ -405,3 +405,4 @@ module_platform_driver(axp20x_regulator_driver); ...@@ -405,3 +405,4 @@ module_platform_driver(axp20x_regulator_driver);
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Carlo Caione <carlo@caione.org>"); MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
MODULE_DESCRIPTION("Regulator Driver for AXP20X PMIC"); MODULE_DESCRIPTION("Regulator Driver for AXP20X PMIC");
MODULE_ALIAS("platform:axp20x-regulator");
...@@ -818,7 +818,6 @@ static int da9062_regulator_probe(struct platform_device *pdev) ...@@ -818,7 +818,6 @@ static int da9062_regulator_probe(struct platform_device *pdev)
static struct platform_driver da9062_regulator_driver = { static struct platform_driver da9062_regulator_driver = {
.driver = { .driver = {
.name = "da9062-regulators", .name = "da9062-regulators",
.owner = THIS_MODULE,
}, },
.probe = da9062_regulator_probe, .probe = da9062_regulator_probe,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment