summaryrefslogtreecommitdiff
path: root/drivers/rtc/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-03-16 01:50:18 +0100
committerWolfgang Denk <wd@denx.de>2008-03-16 01:50:18 +0100
commite95bcc3661a78ccc094c365ecd2484d00a60f97d (patch)
tree0987662fbde9b8792a95ff00023bc22cfbaf2528 /drivers/rtc/Makefile
parent0b8f2a27861a9fd06eb55a34f855ec9c5102aab4 (diff)
parentdecbe029b2a9d3333d02c433389b1c821eea96d7 (diff)
downloadu-boot-imx-e95bcc3661a78ccc094c365ecd2484d00a60f97d.zip
u-boot-imx-e95bcc3661a78ccc094c365ecd2484d00a60f97d.tar.gz
u-boot-imx-e95bcc3661a78ccc094c365ecd2484d00a60f97d.tar.bz2
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Conflicts: drivers/rtc/Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/rtc/Makefile')
-rw-r--r--drivers/rtc/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 56847d2..9be2130 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -27,8 +27,8 @@ include $(TOPDIR)/config.mk
LIB = $(obj)librtc.a
-COBJS-y += date.o
COBJS-y += bfin_rtc.o
+COBJS-y += date.o
COBJS-y += ds12887.o
COBJS-y += ds1302.o
COBJS-y += ds1306.o
@@ -39,20 +39,22 @@ COBJS-y += ds1556.o
COBJS-y += ds164x.o
COBJS-y += ds174x.o
COBJS-y += ds3231.o
+COBJS-$(CONFIG_RTC_ISL1208) += isl1208.o
COBJS-y += m41t11.o
COBJS-y += m41t60.o
COBJS-$(CONFIG_RTC_M41T62) += m41t62.o
COBJS-y += max6900.o
COBJS-y += m48t35ax.o
+COBJS-y += max6900.o
COBJS-y += mc146818.o
+COBJS-y += mcfrtc.o
COBJS-y += mk48t59.o
COBJS-y += mpc5xxx.o
COBJS-y += mpc8xx.o
COBJS-y += pcf8563.o
-COBJS-y += s3c24x0_rtc.o
COBJS-y += rs5c372.o
COBJS-y += rx8025.o
-COBJS-y += mcfrtc.o
+COBJS-y += s3c24x0_rtc.o
COBJS-y += x1205.o
COBJS := $(COBJS-y)