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

[cascardo/linux.git] / drivers / hsi / controllers / omap_ssi_port.c

diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c
index 7e31ecc..1f8652b 100644 (file)
--- a/drivers/hsi/controllers/omap_ssi_port.c
+++ b/drivers/hsi/controllers/omap_ssi_port.c
@@ -1259,7 +1259,7 @@ static int __exit ssi_port_remove(struct platform_device *pd)
        return 0;
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int ssi_save_port_ctx(struct omap_ssi_port *omap_port)
 {
        struct hsi_port *port = to_hsi_port(omap_port->dev);
@@ -1384,7 +1384,6 @@ static struct platform_driver ssi_port_pdriver = {
        .remove = __exit_p(ssi_port_remove),
        .driver = {
                .name   = "omap_ssi_port",
-               .owner  = THIS_MODULE,
                .of_match_table = omap_ssi_port_of_match,
                .pm     = DEV_PM_OPS,
        },