diff options
| author | Anatolij Gustschin <agust@denx.de> | 2013-03-29 13:54:10 +0100 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2013-03-29 13:54:10 +0100 |
| commit | d0f34f10f14853ebe3f75371533708aa0639d830 (patch) | |
| tree | 5e6bf57ff36e9e52c1a3d78a083883eca73978c4 /drivers/video/Makefile | |
| parent | 009d75ccc11d27b9a083375a88bb93cb746b4800 (diff) | |
| parent | acf3baad23586bcaf9af608b8c31949ab54e8338 (diff) | |
| download | u-boot-imx-d0f34f10f14853ebe3f75371533708aa0639d830.zip u-boot-imx-d0f34f10f14853ebe3f75371533708aa0639d830.tar.gz u-boot-imx-d0f34f10f14853ebe3f75371533708aa0639d830.tar.bz2 | |
Merge branch 'for-v2013.04'
Conflicts:
drivers/video/Makefile
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'drivers/video/Makefile')
| -rw-r--r-- | drivers/video/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index e8cecca..53952ab 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -35,11 +35,12 @@ COBJS-$(CONFIG_EXYNOS_MIPI_DSIM) += exynos_mipi_dsi.o exynos_mipi_dsi_common.o \ exynos_mipi_dsi_lowlevel.o COBJS-$(CONFIG_EXYNOS_PWM_BL) += exynos_pwm_bl.o COBJS-$(CONFIG_FSL_DIU_FB) += fsl_diu_fb.o videomodes.o +COBJS-$(CONFIG_MPC8XX_LCD) += mpc8xx_lcd.o +COBJS-$(CONFIG_PXA_LCD) += pxa_lcd.o COBJS-$(CONFIG_S6E8AX0) += s6e8ax0.o COBJS-$(CONFIG_S6E63D6) += s6e63d6.o COBJS-$(CONFIG_LD9040) += ld9040.o COBJS-$(CONFIG_SED156X) += sed156x.o -COBJS-$(CONFIG_VIDEO_AMBA) += amba.o COBJS-$(CONFIG_VIDEO_BCM2835) += bcm2835.o COBJS-$(CONFIG_VIDEO_COREBOOT) += coreboot_fb.o COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o |