projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2332e13)
MLK-16695-4: mipi_csi: fix build error
authorGuoniu.Zhou <guoniu.zhou@nxp.com>
Tue, 14 Nov 2017 08:24:56 +0000 (16:24 +0800)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 20:46:56 +0000 (15:46 -0500)
Delete #ifdef CONFIG_PM_SLEEP statement which
lead to build error.

Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
(cherry picked from commit ea30b5c6631379cd054f949480e0c897e445c1b0)

drivers/media/platform/imx8/mxc-isi-core.c patch | blob | history
drivers/media/platform/imx8/mxc-mipi-csi2.c patch | blob | history

diff --git a/drivers/media/platform/imx8/mxc-isi-core.c b/drivers/media/platform/imx8/mxc-isi-core.c
index 45174f3..4385f0f 100644 (file)
--- a/drivers/media/platform/imx8/mxc-isi-core.c
+++ b/drivers/media/platform/imx8/mxc-isi-core.c
@@ -197,7 +197,6 @@ static int mxc_isi_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int mxc_isi_pm_suspend(struct device *dev)
 {
        struct mxc_isi_dev *mxc_isi = dev_get_drvdata(dev);
diff --git a/drivers/media/platform/imx8/mxc-mipi-csi2.c b/drivers/media/platform/imx8/mxc-mipi-csi2.c
index d463f1f..2b24570 100644 (file)
--- a/drivers/media/platform/imx8/mxc-mipi-csi2.c
+++ b/drivers/media/platform/imx8/mxc-mipi-csi2.c
@@ -610,7 +610,6 @@ static int mipi_csi2_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int  mipi_csi2_pm_suspend(struct device *dev)
 {
        struct mxc_mipi_csi2_dev *csi2dev = dev_get_drvdata(dev);