diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 08:55:17 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 08:55:17 +0300 |
| commit | aa2cf420593b67cc93de7a3f675b2a88eba0505f (patch) | |
| tree | dfb3c73a8a3987c3b3ba08083f379ebc90942e03 /drivers/video/Makefile | |
| parent | d71cb81af3817193bc605de061da0499934263a6 (diff) | |
| parent | 178ff4c9175db447f93b7343954b1d44707c881b (diff) | |
| download | linux-aa2cf420593b67cc93de7a3f675b2a88eba0505f.tar.xz | |
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
MAINTAINERS: Add OMAP2/3 DSS and OMAPFB maintainer
OMAP: SDP: Enable DSS2 for OMAP3 SDP board
OMAP: DSS2: Taal DSI command mode panel driver
OMAP: DSS2: Add generic and Sharp panel drivers
OMAP: DSS2: omapfb driver
OMAP: DSS2: DSI driver
OMAP: DSS2: SDI driver
OMAP: DSS2: RFBI driver
OMAP: DSS2: Video encoder driver
OMAP: DSS2: DPI driver
OMAP: DSS2: DISPC
OMAP: DSS2: Add more core files
OMAP: DSS2: Display Subsystem Driver core
OMAP: DSS2: Documentation for DSS2
OMAP: Add support for VRFB rotation engine
OMAP: Add VRAM manager
OMAP: OMAPFB: add omapdss device
OMAP: OMAPFB: split omapfb.h
OMAP2: Add funcs for writing SMS_ROT_* registers
Diffstat (limited to 'drivers/video/Makefile')
| -rw-r--r-- | drivers/video/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 80232e124889..0f8da331ba0f 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -124,6 +124,7 @@ obj-$(CONFIG_FB_SM501) += sm501fb.o obj-$(CONFIG_FB_XILINX) += xilinxfb.o obj-$(CONFIG_FB_SH_MOBILE_LCDC) += sh_mobile_lcdcfb.o obj-$(CONFIG_FB_OMAP) += omap/ +obj-y += omap2/ obj-$(CONFIG_XEN_FBDEV_FRONTEND) += xen-fbfront.o obj-$(CONFIG_FB_CARMINE) += carminefb.o obj-$(CONFIG_FB_MB862XX) += mb862xx/ |