commit 04e11cf3 "rtc: add support for 4543 RTC (manufactured by e.g.
EPSON)" introduces the following build error on boards configuring e.g,
the ds1374 rtc:
Configuring for MPC837XEMDS board...
ds1374.c:103: error: static declaration of 'rtc_read' follows non-static
declaration
/home/r1aaha/git/u-boot/include/rtc.h:64: error: previous declaration of
'rtc_read' was here
ds1374.c:104: error: conflicting types for 'rtc_write'
/home/r1aaha/git/u-boot/include/rtc.h:65: error: previous declaration of
'rtc_write' was here
this reverts the erroneous chunk.
Signed-off-by: Kim Phillips <kim.phill...@freescale.com>
CC: Detlev Zundel <d...@denx.de>
CC: Andreas Pfefferle <a...@denx.de>
---
include/rtc.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/include/rtc.h b/include/rtc.h
index 019c2eb..785fbe3 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -61,8 +61,4 @@ void to_tm (int, struct rtc_time *);
unsigned long mktime (unsigned int, unsigned int, unsigned int,
unsigned int, unsigned int, unsigned int);
-uchar rtc_read(uchar reg) __attribute__((weak));
-void rtc_write(uchar reg, uchar val) __attribute__((weak));
-
-
#endif /* _RTC_H_ */
--
1.6.1.3
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
