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

diff --combined drivers/rtc/Makefile
index 86f855f,07c12fa..f41f33d
--- 1/drivers/rtc/Makefile
--- 2/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@@ -32,8 -32,7 +32,8 @@@ COBJS-y += date.
  COBJS-$(CONFIG_RTC_DS12887) += ds12887.o
  COBJS-$(CONFIG_RTC_DS1302) += ds1302.o
  COBJS-$(CONFIG_RTC_DS1306) += ds1306.o
 -COBJS-$(CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338) += ds1307.o
 +COBJS-$(CONFIG_RTC_DS1307)$(CONFIG_RTC_DS1338) += ds1307.o
 +COBJS-y += $(COBJS-yy)
  COBJS-$(CONFIG_RTC_DS1337) += ds1337.o
  COBJS-$(CONFIG_RTC_DS1374) += ds1374.o
  COBJS-$(CONFIG_RTC_DS1556) += ds1556.o
@@@ -53,6 -52,7 +53,7 @@@ COBJS-$(CONFIG_RTC_MK48T59) += mk48t59.
  COBJS-$(CONFIG_RTC_MPC5200) += mpc5xxx.o
  COBJS-$(CONFIG_RTC_MPC8xx) += mpc8xx.o
  COBJS-$(CONFIG_RTC_PCF8563) += pcf8563.o
+ COBJS-$(CONFIG_RTC_PL031) += pl031.o
  COBJS-$(CONFIG_RTC_RS5C372A) += rs5c372.o
  COBJS-$(CONFIG_RTC_RX8025) += rx8025.o
  COBJS-$(CONFIG_RTC_S3C24X0) += s3c24x0_rtc.o