Merge tag 'lsk-v3.10-android-15.02'

[firefly-linux-kernel-4.4.55.git] / drivers / video / Makefile

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 3adbd32eb091aa6e3e54fb947e292deee54b24b8..65a5cf70438ef056a1cc835bdeff50b500804072 100644 (file)
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -152,6 +152,8 @@ obj-$(CONFIG_FB_NUC900)           += nuc900fb.o
 obj-$(CONFIG_FB_JZ4740)                  += jz4740_fb.o
 obj-$(CONFIG_FB_PUV3_UNIGFX)      += fb-puv3.o
 obj-$(CONFIG_FB_HYPERV)                  += hyperv_fb.o
+obj-$(CONFIG_FB_ROCKCHIP)         += rockchip/
+obj-$(CONFIG_DRM_ROCKCHIP)         += rockchip/
 
 # Platform or fallback drivers go here
 obj-$(CONFIG_FB_UVESA)            += uvesafb.o
@@ -169,7 +171,6 @@ obj-$(CONFIG_FB_DA8XX)                += da8xx-fb.o
 obj-$(CONFIG_FB_MXS)             += mxsfb.o
 obj-$(CONFIG_FB_SSD1307)         += ssd1307fb.o
 obj-$(CONFIG_FB_SIMPLE)           += simplefb.o
-
 # the test framebuffer is last
 obj-$(CONFIG_FB_VIRTUAL)          += vfb.o