diff options
| author | Srivatsa Vaddagiri <svaddagi@qti.qualcomm.com> | 2017-03-26 21:46:41 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-26 21:46:41 -0700 |
| commit | 82bda7ef2899333afa9e0fded50891491ef8d0a8 (patch) | |
| tree | 27a690bd06b152601576623afcb43902a0d319c6 | |
| parent | 8451f7a2a0177ddc338d6f3bd762c0fe06f01394 (diff) | |
| parent | d0829c0b171ab875be7ab8d1ae7278d1ab43fb94 (diff) | |
Merge "video: fbdev: msm: build msm driver when dba is enabled" into dev/msm-4.4-8996au
| -rw-r--r-- | drivers/video/fbdev/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile index f6f65ccce8e7..238e851c0705 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -126,7 +126,11 @@ obj-y += omap2/ obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_MB862XX) += mb862xx/ -obj-$(CONFIG_FB_MSM) += msm/ +ifeq ($(CONFIG_FB_MSM),y) +obj-y += msm/ +else +obj-$(CONFIG_MSM_DBA) += msm/msm_dba/ +endif obj-$(CONFIG_FB_NUC900) += nuc900fb.o obj-$(CONFIG_FB_JZ4740) += jz4740_fb.o obj-$(CONFIG_FB_PUV3_UNIGFX) += fb-puv3.o |