summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnder.Dai <ender.dai@gmail.com>2010-04-22 15:24:25 +0800
committerWolfgang Denk <wd@denx.de>2010-05-06 00:41:08 +0200
commit767fdc4af684770f5e97a6c5e19a8ac2616b8329 (patch)
tree42f20fbe819ba7e858272e7a80d01d838e515603
parent54fa2c5b51c564cce716942d26492437457980a4 (diff)
downloadtalos-obmc-uboot-767fdc4af684770f5e97a6c5e19a8ac2616b8329.tar.gz
talos-obmc-uboot-767fdc4af684770f5e97a6c5e19a8ac2616b8329.zip
drivers/*/Makefile: fix conditional compile rule.
Fix conditional compile rule for twl4030.c and videomodes.c. Signed-off-by: Ender.Dai <ender.dai@gmail.com>
-rw-r--r--drivers/usb/phy/Makefile1
-rw-r--r--drivers/video/Makefile9
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index 200b907d97..f09e55fd4c 100644
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
@@ -23,7 +23,6 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libusb_phy.a
COBJS-$(CONFIG_TWL4030_USB) += twl4030.o
-COBJS-y := twl4030.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index a5e339a21b..7d84fc71a6 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -25,20 +25,19 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libvideo.a
-COBJS-$(CONFIG_ATI_RADEON_FB) += ati_radeon_fb.o
+COBJS-$(CONFIG_ATI_RADEON_FB) += ati_radeon_fb.o videomodes.o
COBJS-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o
COBJS-$(CONFIG_CFB_CONSOLE) += cfb_console.o
COBJS-$(CONFIG_S6E63D6) += s6e63d6.o
COBJS-$(CONFIG_VIDEO_AMBA) += amba.o
-COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o
-COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o
+COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o
+COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o
COBJS-$(CONFIG_VIDEO_MX3) += mx3fb.o
COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o
COBJS-$(CONFIG_SED156X) += sed156x.o
COBJS-$(CONFIG_VIDEO_SM501) += sm501.o
-COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o
+COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
-COBJS-y += videomodes.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OpenPOWER on IntegriCloud