diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-03-27 04:16:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:44:50 -0500 |
| commit | 4079c39aaab65022f4875609d76e62669ef94c29 (patch) | |
| tree | dbbd70f34f2054e49593bc20d4012fab300fee71 /arch/arm | |
| parent | 12b824fb15a37cdcdfa3e92c9e912a07cc6f7a24 (diff) | |
[PATCH] RTC subsystem: ARM Integrator cleanup
Fix some namespace conflicts between the RTC subsystem and the ARM Integrator
time functions.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-integrator/time.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c index 3c22c16b38bf..bc07f52a6fd7 100644 --- a/arch/arm/mach-integrator/time.c +++ b/arch/arm/mach-integrator/time.c | |||
| @@ -40,13 +40,13 @@ static int integrator_set_rtc(void) | |||
| 40 | return 1; | 40 | return 1; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | static int rtc_read_alarm(struct rtc_wkalrm *alrm) | 43 | static int integrator_rtc_read_alarm(struct rtc_wkalrm *alrm) |
| 44 | { | 44 | { |
| 45 | rtc_time_to_tm(readl(rtc_base + RTC_MR), &alrm->time); | 45 | rtc_time_to_tm(readl(rtc_base + RTC_MR), &alrm->time); |
| 46 | return 0; | 46 | return 0; |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | static inline int rtc_set_alarm(struct rtc_wkalrm *alrm) | 49 | static inline int integrator_rtc_set_alarm(struct rtc_wkalrm *alrm) |
| 50 | { | 50 | { |
| 51 | unsigned long time; | 51 | unsigned long time; |
| 52 | int ret; | 52 | int ret; |
| @@ -62,7 +62,7 @@ static inline int rtc_set_alarm(struct rtc_wkalrm *alrm) | |||
| 62 | return ret; | 62 | return ret; |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | static int rtc_read_time(struct rtc_time *tm) | 65 | static int integrator_rtc_read_time(struct rtc_time *tm) |
| 66 | { | 66 | { |
| 67 | rtc_time_to_tm(readl(rtc_base + RTC_DR), tm); | 67 | rtc_time_to_tm(readl(rtc_base + RTC_DR), tm); |
| 68 | return 0; | 68 | return 0; |
| @@ -76,7 +76,7 @@ static int rtc_read_time(struct rtc_time *tm) | |||
| 76 | * edge of the 1Hz clock, we must write the time one second | 76 | * edge of the 1Hz clock, we must write the time one second |
| 77 | * in advance. | 77 | * in advance. |
| 78 | */ | 78 | */ |
| 79 | static inline int rtc_set_time(struct rtc_time *tm) | 79 | static inline int integrator_rtc_set_time(struct rtc_time *tm) |
| 80 | { | 80 | { |
| 81 | unsigned long time; | 81 | unsigned long time; |
| 82 | int ret; | 82 | int ret; |
| @@ -90,10 +90,10 @@ static inline int rtc_set_time(struct rtc_time *tm) | |||
| 90 | 90 | ||
| 91 | static struct rtc_ops rtc_ops = { | 91 | static struct rtc_ops rtc_ops = { |
| 92 | .owner = THIS_MODULE, | 92 | .owner = THIS_MODULE, |
| 93 | .read_time = rtc_read_time, | 93 | .read_time = integrator_rtc_read_time, |
| 94 | .set_time = rtc_set_time, | 94 | .set_time = integrator_rtc_set_time, |
| 95 | .read_alarm = rtc_read_alarm, | 95 | .read_alarm = integrator_rtc_read_alarm, |
| 96 | .set_alarm = rtc_set_alarm, | 96 | .set_alarm = integrator_rtc_set_alarm, |
| 97 | }; | 97 | }; |
| 98 | 98 | ||
| 99 | static irqreturn_t arm_rtc_interrupt(int irq, void *dev_id, | 99 | static irqreturn_t arm_rtc_interrupt(int irq, void *dev_id, |