Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / hsi / controllers / omap_ssi.c

diff --git a/drivers/hsi/controllers/omap_ssi.c b/drivers/hsi/controllers/omap_ssi.c
index bf0eace4cb672346dee6d867f811e528b18d65f0..089c6c3feb3ecb3349bfc6e0488ed32a72ad74ed 100644 (file)
--- a/drivers/hsi/controllers/omap_ssi.c
+++ b/drivers/hsi/controllers/omap_ssi.c
@@ -555,7 +555,7 @@ static int __exit ssi_remove(struct platform_device *pd)
        return 0;
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int omap_ssi_runtime_suspend(struct device *dev)
 {
        struct hsi_controller *ssi = dev_get_drvdata(dev);
@@ -610,7 +610,6 @@ static struct platform_driver ssi_pdriver = {
        .remove = __exit_p(ssi_remove),
        .driver = {
                .name   = "omap_ssi",
-               .owner  = THIS_MODULE,
                .pm     = DEV_PM_OPS,
                .of_match_table = omap_ssi_of_match,
        },