diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-10 14:15:24 +0100 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2020-08-13 16:05:08 +0200 |
| commit | df6f39bb416e3871c0534611f0d27e931349bb08 (patch) | |
| tree | bbe36255d6af365d218e1e9b040876aec5da7e27 /drivers/video | |
| parent | 19fa59344544242cfd0fe0dda8d71399c0bc62ed (diff) | |
video: fbdev: mxsfb: fix build with disabled overlay support
This fixes building with disabled CONFIG_FB_MXC_OVERLAY.
Fixes: dffeff8e10a6 ("MLK-22304-2 fbdev: mxsfb: fix build warnings if CONFIG_PM_SLEEP off")
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 62abed65f49ee116d57539369b531a0641e54163)
Conflicts:
drivers/video/fbdev/mxsfb.c
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/mxsfb.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/video/fbdev/mxsfb.c b/drivers/video/fbdev/mxsfb.c index f56959421705..29b851dfafec 100644 --- a/drivers/video/fbdev/mxsfb.c +++ b/drivers/video/fbdev/mxsfb.c @@ -478,7 +478,7 @@ static const struct fb_bitfield def_rgb444[] = { .length = 0, } }; -#endif +#endif /* CONFIG_FB_MXC_OVERLAY */ static const struct fb_bitfield def_rgb666[] = { [RED] = { @@ -2241,11 +2241,14 @@ static void mxsfb_overlay_suspend(struct mxsfb_info *fbi) clk_disable_pix(fbi); } } -#endif +#endif /* CONFIG_PM_SLEEP */ -#else +#else /* CONFIG_FB_MXC_OVERLAY */ static void mxsfb_overlay_init(struct mxsfb_info *fbi) {} static void mxsfb_overlay_exit(struct mxsfb_info *fbi) {} +#endif /* CONFIG_FB_MXC_OVERLAY */ + +#if !(defined(CONFIG_FB_MXC_OVERLAY) && defined(CONFIG_PM_SLEEP)) static void mxsfb_overlay_resume(struct mxsfb_info *fbi) {} static void mxsfb_overlay_suspend(struct mxsfb_info *fbi) {} #endif @@ -2500,7 +2503,7 @@ static int mxsfb_runtime_resume(struct device *dev) return 0; } -#endif +#endif /* CONFIG_PM */ #ifdef CONFIG_PM_SLEEP static int mxsfb_suspend(struct device *pdev) @@ -2539,7 +2542,7 @@ static int mxsfb_resume(struct device *pdev) return 0; } -#endif +#endif /* CONFIG_PM_SLEEP */ static const struct dev_pm_ops mxsfb_pm_ops = { SET_RUNTIME_PM_OPS(mxsfb_runtime_suspend, mxsfb_runtime_resume, NULL) |