From: Wolfgang Denk <wd@denx.de>
Date: Wed, 1 Apr 2009 22:24:33 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2009.06-rc1~112
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dfc91c33957c95da34e3888dc87912d5c15a7603;p=oweals%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-arm
---

dfc91c33957c95da34e3888dc87912d5c15a7603
diff --cc drivers/rtc/Makefile
index 6adece23cc,3831dd9ee0..822dc1a0e1
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@@ -55,9 -55,9 +55,10 @@@ COBJS-$(CONFIG_RTC_MPC8xx) += mpc8xx.
  COBJS-$(CONFIG_RTC_PCF8563) += pcf8563.o
  COBJS-$(CONFIG_RTC_PL031) += pl031.o
  COBJS-$(CONFIG_RTC_RS5C372A) += rs5c372.o
 +COBJS-$(CONFIG_RTC_RTC4543) += rtc4543.o
  COBJS-$(CONFIG_RTC_RX8025) += rx8025.o
  COBJS-$(CONFIG_RTC_S3C24X0) += s3c24x0_rtc.o
+ COBJS-$(CONFIG_RTC_S3C44B0) += s3c44b0_rtc.o
  COBJS-$(CONFIG_RTC_X1205) += x1205.o
  
  COBJS	:= $(sort $(COBJS-y))