summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Yao <mark.yao@rock-chips.com>2016-01-12 08:51:12 +0100
committerMark Yao <mark.yao@rock-chips.com>2016-01-18 01:42:08 +0100
commitce90d092bcd96b646b370121f0f1508270627f98 (patch)
treeb5bc9ab444e89b1b0cad43f5b9189f9e57138acf
parentMerge tag 'drm-intel-next-fixes-2016-01-14' of git://anongit.freedesktop.org/... (diff)
downloadlinux-ce90d092bcd96b646b370121f0f1508270627f98.tar.xz
linux-ce90d092bcd96b646b370121f0f1508270627f98.zip
drm/rockchip: Don't build rockchip_drm_vop as modules
rockchip_drm_vop's module init had moved to rockchip_vop_reg.c so no need to build rockchip_drm_vop.ko Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
-rw-r--r--drivers/gpu/drm/rockchip/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
index d1dc0f7b01db..a4e03bcde035 100644
--- a/drivers/gpu/drm/rockchip/Makefile
+++ b/drivers/gpu/drm/rockchip/Makefile
@@ -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