From: Wolfgang Denk Date: Sun, 16 Mar 2008 00:50:18 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master X-Git-Tag: v1.3.3-rc1~205 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-u-boot.git;a=commitdiff_plain;h=e95bcc3661a78ccc094c365ecd2484d00a60f97d 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 --- e95bcc3661a78ccc094c365ecd2484d00a60f97d diff --cc drivers/rtc/Makefile index 56847d2448,c1bf319708..9be2130e1b --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@@ -39,12 -39,13 +39,15 @@@ COBJS-y += ds1556. 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