Update of /cvsroot/linuxsh/linux/include/asm-sh
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19538/include/asm-sh
Modified Files:
rtc.h
Log Message:
Rename rtc_get_time/rtc_set_time to avoid namespace conflict with RTC subsystem.
Index: rtc.h
===================================================================
RCS file: /cvsroot/linuxsh/linux/include/asm-sh/rtc.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rtc.h 24 Sep 2004 14:58:00 -0000 1.5
+++ rtc.h 7 Jul 2006 10:45:05 -0000 1.6
@@ -8,8 +8,8 @@
extern void sh_rtc_gettimeofday(struct timespec *ts);
extern int sh_rtc_settimeofday(const time_t secs);
extern void (*board_time_init)(void);
-extern void (*rtc_get_time)(struct timespec *);
-extern int (*rtc_set_time)(const time_t);
+extern void (*rtc_sh_get_time)(struct timespec *);
+extern int (*rtc_sh_set_time)(const time_t);
/* RCR1 Bits */
#define RCR1_CF 0x80 /* Carry Flag */
|