UPSTREAM: drm/rockchip: Don't build rockchip_drm_vop as modules
authorMark Yao <mark.yao@rock-chips.com>
Tue, 12 Jan 2016 07:51:12 +0000 (15:51 +0800)
committerMark Yao <mark.yao@rock-chips.com>
Thu, 17 Mar 2016 01:42:04 +0000 (09:42 +0800)
rockchip_drm_vop's module init had moved to rockchip_vop_reg.c
so no need to build rockchip_drm_vop.ko

Change-Id: I36da6a2741a250f3344b9febcd0c74539a861798
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
(cherry picked from commit ce90d092bcd96b646b370121f0f1508270627f98)

drivers/gpu/drm/rockchip/Makefile

index d1dc0f7b01dbdf48ad97e2829278b7f61bb6efea..a4e03bcde0353d00968d23fb458284e1ecf89322 100644 (file)
@@ -3,10 +3,9 @@
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
 rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o rockchip_drm_fbdev.o \
-               rockchip_drm_gem.o
+               rockchip_drm_gem.o rockchip_drm_vop.o
 
 obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
 obj-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
 
-obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_drm_vop.o \
-                               rockchip_vop_reg.o
+obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_vop_reg.o