| Message ID | 20180926193846.2490574-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 8c1d1bb0f0bdebd174a6188ca345e44a03becda5 |
| Headers | show |
| Series | drm/imx: fix build failure without CONFIG_DRM_FBDEV_EMULATION | expand |
Den 26.09.2018 21.38, skrev Arnd Bergmann: > The variable is declared in an #ifdef section, but the user is > now unconditional, which leads to a build failure: > > drivers/gpu/drm/imx/imx-drm-core.c: In function 'imx_drm_bind': > drivers/gpu/drm/imx/imx-drm-core.c:264:6: error: 'legacyfb_depth' undeclared (first use in this function); did you mean 'lockdep_depth'? > > Remove the remaining #ifdef as well. > > Fixes: f53705fd9803 ("drm/imx: Use drm_fbdev_generic_setup()") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- Thanks for fixing my mistakes Arnd. Applied to drm-misc-next. Noralf. > drivers/gpu/drm/imx/imx-drm-core.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c > index a70f3131a377..0e6942f21a4e 100644 > --- a/drivers/gpu/drm/imx/imx-drm-core.c > +++ b/drivers/gpu/drm/imx/imx-drm-core.c > @@ -35,10 +35,8 @@ > > #define MAX_CRTC 4 > > -#if IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION) > static int legacyfb_depth = 16; > module_param(legacyfb_depth, int, 0444); > -#endif > > DEFINE_DRM_GEM_CMA_FOPS(imx_drm_driver_fops); >
diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index a70f3131a377..0e6942f21a4e 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -35,10 +35,8 @@ #define MAX_CRTC 4 -#if IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION) static int legacyfb_depth = 16; module_param(legacyfb_depth, int, 0444); -#endif DEFINE_DRM_GEM_CMA_FOPS(imx_drm_driver_fops);
The variable is declared in an #ifdef section, but the user is now unconditional, which leads to a build failure: drivers/gpu/drm/imx/imx-drm-core.c: In function 'imx_drm_bind': drivers/gpu/drm/imx/imx-drm-core.c:264:6: error: 'legacyfb_depth' undeclared (first use in this function); did you mean 'lockdep_depth'? Remove the remaining #ifdef as well. Fixes: f53705fd9803 ("drm/imx: Use drm_fbdev_generic_setup()") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/gpu/drm/imx/imx-drm-core.c | 2 -- 1 file changed, 2 deletions(-) -- 2.18.0