diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 17:11:32 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 17:11:32 +0900 |
| commit | af514ca7d27b31e3c278e1331f0ebdb3ad385a90 (patch) | |
| tree | af5444786b8b9251e6a6f011ee71333025bb2c84 /arch/sh/boards/sh03/rtc.c | |
| parent | 2991be725260d6fec11691a6138b9d71de949956 (diff) | |
| download | blackbird-op-linux-af514ca7d27b31e3c278e1331f0ebdb3ad385a90.tar.gz blackbird-op-linux-af514ca7d27b31e3c278e1331f0ebdb3ad385a90.zip | |
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 'arch/sh/boards/sh03/rtc.c')
| -rw-r--r-- | arch/sh/boards/sh03/rtc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/sh/boards/sh03/rtc.c b/arch/sh/boards/sh03/rtc.c index d609863cfe53..0a9266bb51c5 100644 --- a/arch/sh/boards/sh03/rtc.c +++ b/arch/sh/boards/sh03/rtc.c @@ -10,9 +10,10 @@ #include <linux/sched.h> #include <linux/time.h> #include <linux/bcd.h> -#include <asm/io.h> #include <linux/rtc.h> #include <linux/spinlock.h> +#include <asm/io.h> +#include <asm/rtc.h> #define RTC_BASE 0xb0000000 #define RTC_SEC1 (RTC_BASE + 0) @@ -34,8 +35,6 @@ #define RTC_BUSY 1 #define RTC_STOP 2 -extern void (*rtc_get_time)(struct timespec *); -extern int (*rtc_set_time)(const time_t); extern spinlock_t rtc_lock; unsigned long get_cmos_time(void) @@ -128,6 +127,6 @@ int sh03_rtc_settimeofday(const time_t secs) void sh03_time_init(void) { - rtc_get_time = sh03_rtc_gettimeofday; - rtc_set_time = sh03_rtc_settimeofday; + rtc_sh_get_time = sh03_rtc_gettimeofday; + rtc_sh_set_time = sh03_rtc_settimeofday; } |
