diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:30 +0800 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:30 +0800 |
commit | 1cd04b2aba9f3b3468adf0789030240e032d8d3e (patch) | |
tree | 2e010c15b347b7acda9bc7a2ab4abca9d58043eb /drivers/video/Makefile | |
parent | cff72c10aa27e3a74eb5d5b7ceb7808d8c917d15 (diff) | |
parent | b7086e0a1dec82bf7e8e96e17738151f0aee82fc (diff) |
Merge topic branch 'video' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers/video/Makefile')
-rw-r--r-- | drivers/video/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 9356add945b..3a4ad2ebe33 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -139,6 +139,9 @@ obj-$(CONFIG_FB_SH_MOBILE_MERAM) += sh_mobile_meram.o obj-$(CONFIG_FB_SH_MOBILE_LCDC) += sh_mobile_lcdcfb.o obj-$(CONFIG_FB_OMAP) += omap/ obj-y += omap2/ +obj-$(CONFIG_FB_MCDE) += mcde/ +obj-$(CONFIG_AV8100) += av8100/ +obj-y += b2r2/ obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_MB862XX) += mb862xx/ |