diff options
| author | Kumar Gala <[email protected]> | 2006-03-20 10:42:05 -0600 |
|---|---|---|
| committer | Kumar Gala <[email protected]> | 2006-03-20 10:42:05 -0600 |
| commit | f8edca2e9a128f526b1fe6f997f7adb852cf5b3c (patch) | |
| tree | 92deb9ddf1153c64ff1ced9392816e60b4ecaa03 /rtc/Makefile | |
| parent | 79582020313e6d992a3bac71cf3a9b337f9ac7f7 (diff) | |
| parent | 7b4fd36b0322ec98836a8459d9be80e2777fdc05 (diff) | |
Merge branch 'origin'
Conflicts:
CHANGELOG
Diffstat (limited to 'rtc/Makefile')
| -rw-r--r-- | rtc/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rtc/Makefile b/rtc/Makefile index 4ceac76933e..2c5d099feef 100644 --- a/rtc/Makefile +++ b/rtc/Makefile @@ -28,8 +28,8 @@ include $(TOPDIR)/config.mk LIB = librtc.a OBJS = date.o \ - ds12887.o ds1302.o ds1306.o ds1307.o ds1337.o \ - ds1556.o ds164x.o ds174x.o \ + bf533_rtc.o ds12887.o ds1302.o ds1306.o ds1307.o \ + ds1337.o ds1374.o ds1556.o ds164x.o ds174x.o \ m41t11.o max6900.o m48t35ax.o mc146818.o mk48t59.o \ mpc5xxx.o mpc8xx.o pcf8563.o s3c24x0_rtc.o rs5c372.o |