diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/video/Makefile | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/video/Makefile')
| -rw-r--r-- | drivers/video/Makefile | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 5109409..ff3c7b2 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -121,14 +121,24 @@ obj-$(CONFIG_FB_MIPI_DSIM) += s5p_mipi_dsi.o s5p_mipi_dsi_lowlevel.o obj-$(CONFIG_FB_S3C) += s3c-fb.o obj-$(CONFIG_S5P_DP) += s5p-dp-core.o s5p-dp-reg.o obj-$(CONFIG_FB_S3C2410) += s3c2410fb.o +ifeq ($(CONFIG_S5P_DSIM_SWITCHABLE_DUAL_LCD),y) +obj-$(CONFIG_FB_S5P) += samsung_duallcd/ +ifeq ($(CONFIG_NAPLES_COMMON),y) +obj-$(CONFIG_S5P_MIPI_DSI2) += samsung_duallcd/dsim2_tmp/ +else +obj-$(CONFIG_S5P_MIPI_DSI2) += samsung_duallcd/dsim2/ +endif +obj-$(CONFIG_FIMD_EXT_SUPPORT) += samsung_duallcd/extension/ +else obj-$(CONFIG_FB_S5P) += samsung/ ifeq ($(CONFIG_NAPLES_COMMON),y) obj-$(CONFIG_S5P_MIPI_DSI2) += samsung/dsim2_tmp/ else obj-$(CONFIG_S5P_MIPI_DSI2) += samsung/dsim2/ endif -obj-$(CONFIG_FB_S5P_EXTDSP) += samsung_extdisp/ obj-$(CONFIG_FIMD_EXT_SUPPORT) += samsung/extension/ +endif +obj-$(CONFIG_FB_S5P_EXTDSP) += samsung_extdisp/ obj-$(CONFIG_FB_FSL_DIU) += fsl-diu-fb.o obj-$(CONFIG_FB_COBALT) += cobalt_lcdfb.o obj-$(CONFIG_FB_PNX4008_DUM) += pnx4008/ @@ -173,6 +183,3 @@ obj-$(CONFIG_FB_VIRTUAL) += vfb.o #video output switch sysfs driver obj-$(CONFIG_VIDEO_OUTPUT_CONTROL) += output.o -ifeq ($(CONFIG_VITHAR),y) - EXTRA_CFLAGS += -Idrivers/gpu/vithar -endif |