diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2011-09-04 12:48:34 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-09-05 09:15:39 +0200 |
| commit | 9d75de095180211190f0df2e61746807e360ec13 (patch) | |
| tree | aafcafa76f02c3b5aa308b1d7356699cc67b8a2a /drivers/video | |
| parent | 58c583b6c2ebc459de018c772fea5437de430063 (diff) | |
| download | u-boot-imx-9d75de095180211190f0df2e61746807e360ec13.zip u-boot-imx-9d75de095180211190f0df2e61746807e360ec13.tar.gz u-boot-imx-9d75de095180211190f0df2e61746807e360ec13.tar.bz2 | |
video: Fix build error with global inclusion of videomodes
The following commit:
commit de701d118380de12a48c8a4fb345e9f909329432
Author: Syed Mohammed Khasim <khasim@ti.com>
Date: Tue Apr 19 14:00:34 2011 -0500
OMAP3: Add DSS driver for OMAP3
Added videomodes to the object list w/o any protection. This causes
build issues like:
videomodes.o:(.rodata.res_mode_init+0x0): multiple definition of `res_mode_init'
videomodes.o:(.rodata.res_mode_init+0x0): first defined here
videomodes.o: In function `video_get_params':
/local/home/galak/git/u-boot/drivers/video/videomodes.c:160: multiple definition of `video_get_params'
videomodes.o:/local/home/galak/git/u-boot/drivers/video/videomodes.c:160: first defined here
videomodes.o: In function `video_get_video_mode':
/local/home/galak/git/u-boot/drivers/video/videomodes.c:229: multiple definition of `video_get_video_mode'
videomodes.o:/local/home/galak/git/u-boot/drivers/video/videomodes.c:229: first defined here
videomodes.o:(.rodata.vesa_modes+0x0): multiple definition of `vesa_modes'
videomodes.o:(.rodata.vesa_modes+0x0): first defined here
make[1]: *** [libvideo.o] Error 1
Remove the unconditional inclusion and move to adding to
CONFIG_VIDEO_OMAP3 case.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 226684ad..db8a454 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -41,8 +41,7 @@ COBJS-$(CONFIG_SED156X) += sed156x.o COBJS-$(CONFIG_VIDEO_SM501) += sm501.o COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o -COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o -COBJS-y += videomodes.o +COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o videomodes.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) |