From: Stefan Roese <sr@denx.de>
Date: Tue, 11 Dec 2007 10:34:54 +0000 (+0100)
Subject: Merge commit 'u-boot/master' into for-1.3.1
X-Git-Tag: v2025.01-rc5-pxa1908~22626^2~62
X-Git-Url: http://git.dujemihanovic.xyz/img/static/gitweb.css?a=commitdiff_plain;h=9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105;p=u-boot.git

Merge commit 'u-boot/master' into for-1.3.1

Conflicts:

	drivers/rtc/Makefile
---

9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105
diff --cc drivers/rtc/Makefile
index 5a0cf113a5,4a22b0d94f..1d6016ef87
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@@ -27,13 -27,31 +27,32 @@@ include $(TOPDIR)/config.m
  
  LIB	= $(obj)librtc.a
  
- COBJS	= date.o   \
- 	  bf5xx_rtc.o ds12887.o ds1302.o ds1306.o ds1307.o \
- 	  ds1337.o ds1374.o ds1556.o ds164x.o ds174x.o ds3231.o \
- 	  m41t11.o max6900.o m48t35ax.o mc146818.o mk48t59.o \
- 	  mpc5xxx.o mpc8xx.o pcf8563.o s3c24x0_rtc.o rs5c372.o \
- 	  mcfrtc.o x1205.o
+ COBJS-y += date.o
+ COBJS-y += bf5xx_rtc.o
+ COBJS-y += ds12887.o
+ COBJS-y += ds1302.o
+ COBJS-y += ds1306.o
+ COBJS-y += ds1307.o
+ COBJS-y += ds1337.o
+ COBJS-y += ds1374.o
+ COBJS-y += ds1556.o
+ COBJS-y += ds164x.o
+ COBJS-y += ds174x.o
+ COBJS-y += ds3231.o
+ COBJS-y += m41t11.o
+ COBJS-y += max6900.o
+ COBJS-y += m48t35ax.o
+ COBJS-y += mc146818.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 += mcfrtc.o
++COBJS-y += x1205.o
  
+ COBJS	:= $(COBJS-y)
  SRCS	:= $(COBJS:.o=.c)
  OBJS	:= $(addprefix $(obj),$(COBJS))