diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 04:11:32 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 04:11:32 -0400 |
| commit | af514ca7d27b31e3c278e1331f0ebdb3ad385a90 (patch) | |
| tree | af5444786b8b9251e6a6f011ee71333025bb2c84 /include | |
| parent | 2991be725260d6fec11691a6138b9d71de949956 (diff) | |
sh: Rename rtc_get/set_time() to avoid RTC_CLASS conflict.
We have a clash with RTC_CLASS over these names, so we
change them..
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sh/rtc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sh/rtc.h b/include/asm-sh/rtc.h index cea9cdf9b925..4c7be859c9c0 100644 --- a/include/asm-sh/rtc.h +++ b/include/asm-sh/rtc.h | |||
| @@ -8,8 +8,8 @@ | |||
| 8 | extern void sh_rtc_gettimeofday(struct timespec *ts); | 8 | extern void sh_rtc_gettimeofday(struct timespec *ts); |
| 9 | extern int sh_rtc_settimeofday(const time_t secs); | 9 | extern int sh_rtc_settimeofday(const time_t secs); |
| 10 | extern void (*board_time_init)(void); | 10 | extern void (*board_time_init)(void); |
| 11 | extern void (*rtc_get_time)(struct timespec *); | 11 | extern void (*rtc_sh_get_time)(struct timespec *); |
| 12 | extern int (*rtc_set_time)(const time_t); | 12 | extern int (*rtc_sh_set_time)(const time_t); |
| 13 | 13 | ||
| 14 | /* RCR1 Bits */ | 14 | /* RCR1 Bits */ |
| 15 | #define RCR1_CF 0x80 /* Carry Flag */ | 15 | #define RCR1_CF 0x80 /* Carry Flag */ |