Merge tag 'media/v3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / drivers / media / platform / coda / coda-common.c

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 42b4630..90b7791 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2160,7 +2160,7 @@ static int coda_probe(struct platform_device *pdev)
 
        /*
         * Start activated so we can directly call coda_hw_init in
-        * coda_fw_callback regardless of whether CONFIG_PM_RUNTIME is
+        * coda_fw_callback regardless of whether CONFIG_PM is
         * enabled or whether the device is associated with a PM domain.
         */
        pm_runtime_get_noresume(&pdev->dev);
@@ -2200,7 +2200,7 @@ static int coda_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
 static int coda_runtime_resume(struct device *dev)
 {
        struct coda_dev *cdev = dev_get_drvdata(dev);