Merge tag 'hsi-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

[cascardo/linux.git] / drivers / rtc / rtc-palmas.c

diff --git a/drivers/rtc/rtc-palmas.c b/drivers/rtc/rtc-palmas.c
index c360d62..3b01d56 100644 (file)
--- a/drivers/rtc/rtc-palmas.c
+++ b/drivers/rtc/rtc-palmas.c
@@ -352,7 +352,7 @@ static SIMPLE_DEV_PM_OPS(palmas_rtc_pm_ops, palmas_rtc_suspend,
                         palmas_rtc_resume);
 
 #ifdef CONFIG_OF
-static struct of_device_id of_palmas_rtc_match[] = {
+static const struct of_device_id of_palmas_rtc_match[] = {
        { .compatible = "ti,palmas-rtc"},
        { },
 };
@@ -363,7 +363,6 @@ static struct platform_driver palmas_rtc_driver = {
        .probe          = palmas_rtc_probe,
        .remove         = palmas_rtc_remove,
        .driver         = {
-               .owner  = THIS_MODULE,
                .name   = "palmas-rtc",
                .pm     = &palmas_rtc_pm_ops,
                .of_match_table = of_match_ptr(of_palmas_rtc_match),