Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99018753 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2018-07-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Fixes for v4.18-rc5:
- Single fix for a build error when the driver is builtin,
  but the backend is a loadable module.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9c596cf5-3f24-070e-74f2-c59bfbaf68fa@linux.intel.com
parents 2757de4c 3156b53c

drivers/gpu/drm/sun4i/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ obj-$(CONFIG_DRM_SUN4I) += sun4i-tcon.o 
obj-$(CONFIG_DRM_SUN4I)		+= sun4i_tv.o

obj-$(CONFIG_DRM_SUN4I)		+= sun6i_drc.o



obj-$(CONFIG_DRM_SUN4I_BACKEND)	+= sun4i-backend.o sun4i-frontend.o

obj-$(CONFIG_DRM_SUN4I_BACKEND)	+= sun4i-backend.o

ifdef CONFIG_DRM_SUN4I_BACKEND

obj-$(CONFIG_DRM_SUN4I)		+= sun4i-frontend.o

endif

obj-$(CONFIG_DRM_SUN4I_HDMI)	+= sun4i-drm-hdmi.o

obj-$(CONFIG_DRM_SUN6I_DSI)	+= sun6i-dsi.o

obj-$(CONFIG_DRM_SUN8I_DW_HDMI)	+= sun8i-drm-hdmi.o