diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-10-11 14:51:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-10-11 14:51:57 +1000 |
| commit | 46972c03ab667dc298cad0c9db517fb9b1521b5f (patch) | |
| tree | 0c35e65bfef95ff4f01c1ae390b094ea2070667b | |
| parent | 66c9e573ea75b63602cf4d3e1fb52fad2dd29be0 (diff) | |
| parent | 7372fd049aa8836310f84da5f82dc9eb146915c8 (diff) | |
Merge tag 'drm-misc-next-fixes-2018-10-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
- Fix build failure without CONFIG_DRM_FBDEV_EMULATION (Arnd)
- Add Maxime to drm-misc maintainer group (Sean)
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Sean Paul <sean@poorly.run>
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20181010203951.GA229456@art_vandelay
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/imx/imx-drm-core.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0c45d35626cf..69373eb328d4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4755,8 +4755,8 @@ F: include/uapi/drm/ F: include/linux/vga* DRM DRIVERS AND MISC GPU PATCHES -M: Gustavo Padovan <gustavo@padovan.org> M: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> +M: Maxime Ripard <maxime.ripard@bootlin.com> M: Sean Paul <sean@poorly.run> W: https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html S: Maintained 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); |