diff options
| author | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:28:39 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:28:39 +0800 |
| commit | 2cfd89e75ffe516e54c871eca15f55ee5a9520af (patch) | |
| tree | d5496ce92c5013d6a12266c11f89da7c3a4a9f40 /drivers/video/mxc/Makefile | |
| parent | 7ac674d56fec2e9dd144416fd616020aad3170cb (diff) | |
| parent | 925e814d9b46346af50dc3c7cf7a6106be5c9723 (diff) | |
Merge branch 'topic/lt-3.2-imx6-display' into lt-3.2-imx6
* topic/lt-3.2-imx6-display: (36 commits)
input: add device tree support for eGalax touch
input: add support for egalax touch screen controller
imx6q-sabrelite: switch framebuffer order of HDMI and LVDS
mxc: hdmi: fix potention deadlock issue
ARM: imx6q-sabrelite: set DDC i2c rate to 100k
ENGR00170800 mxc hdmi add more video mode to default modelist
ENGR00170534 mxc hdmi: hot-plug detect state notify and recording
ENGR00169872-2 rework hdmi initialization and hotplug sequence
ENGR00169872-1 rework hdmi initialization and hotplug sequence
ENGR00170168-2 mxc_vout: add non FB_VMODE_YWRAP support
ENGR00170168-1 ipuv3 fb: add non FB_VMODE_YWRAP support
ENGR00169657 mxc_edid: no aspect vmode setting for detailed timing block
ENGR00163669-1 mxc fb: remove FB_EVENT_PREMODE_CHANGE for mxc fb drivers
ENGR00169509-2 ipuv3 fb: change wait for vsync ioctl irq from eof to nfack
ENGR00169509-1 ipuv3 fb: change wait for vsync ioctl irq from eof to nfack
ENGR00163616 [mx6q]hdmi will hang in daily build image
SAUCE: fix hdmi registration failure
MXC SRC: refine IPU VPU reset function
mxc hdmi core: add Kconfig dependency of MXC_IPU
imx6: change ipu_perclk to 8.25M according to fsl branch
...
Conflicts:
arch/arm/boot/dts/imx6q-sabrelite.dts
arch/arm/boot/dts/imx6q.dtsi
arch/arm/mach-imx/clock-imx6q.c
arch/arm/mach-imx/mach-imx6q.c
Diffstat (limited to 'drivers/video/mxc/Makefile')
| -rw-r--r-- | drivers/video/mxc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/mxc/Makefile b/drivers/video/mxc/Makefile index 4c75e1be2d3..e0d47ed90b4 100644 --- a/drivers/video/mxc/Makefile +++ b/drivers/video/mxc/Makefile @@ -1,5 +1,5 @@ obj-$(CONFIG_FB_MXC_TVOUT_TVE) += tve.o obj-$(CONFIG_FB_MXC_SII902X) += mxcfb_sii902x.o obj-$(CONFIG_FB_MXC_LDB) += ldb.o -obj-$(CONFIG_FB_MODE_HELPERS) += mxc_edid.o +obj-$(CONFIG_FB_MXC_EDID) += mxc_edid.o mxc_dvi.o obj-$(CONFIG_FB_MXC_SYNC_PANEL) += mxc_dispdrv.o mxc_lcdif.o mxc_ipuv3_fb.o |