RTC subsystem, Fix integrator namespace conflicts
Subsystems (2)
PATCH 1/1 RTC subsystem, Fix integrator namespace conflicts
Fix some namespace conflicts between the RTC subsystem and the ARM Integrator time functions.
Signed-off-by Richard Purdie <[email protected]>
arch/arm/mach-integrator/time.c +8 -8
@@ -40,13 +40,13 @@return 1 ; } -static int rtc_read_alarm (struct rtc_wkalrm *alrm) +static int integrator_rtc_read_alarm (struct rtc_wkalrm *alrm) {rtc_time_to_tm (readl (rtc_base +RTC_MR ), &alrm->time);return 0 ; } -static inline int rtc_set_alarm (struct rtc_wkalrm *alrm) +static inline int integrator_rtc_set_alarm (struct rtc_wkalrm *alrm) {unsigned long time;int ret;
@@ -62,7 +62,7 @@return ret; } -static int rtc_read_time (struct rtc_time *tm) +static int integrator_rtc_read_time (struct rtc_time *tm) {rtc_time_to_tm (readl (rtc_base +RTC_DR ), tm);return 0 ;
@@ -76,7 +76,7 @@* edge of the 1Hz clock, we must write the time one second * in advance. */ -static inline int rtc_set_time (struct rtc_time *tm) +static inline int integrator_rtc_set_time (struct rtc_time *tm) {unsigned long time;int ret;
@@ -90,10 +90,10 @@static struct rtc_ops rtc_ops = { .owner =THIS_MODULE , - .read_time = rtc_read_time, - .set_time = rtc_set_time, - .read_alarm = rtc_read_alarm, - .set_alarm = rtc_set_alarm, + .read_time = integrator_rtc_read_time, + .set_time = integrator_rtc_set_time, + .read_alarm = integrator_rtc_read_alarm, + .set_alarm = integrator_rtc_set_alarm, };static irqreturn_t rtc_interrupt (int irq,void *dev_id,struct pt_regs *regs)
Alessandro Zummo
AppliedQuoted 4 lines · On Sat, 04 Mar 2006 22:23:26 +0000 Richard Purdie <[email protected]> wrote:
Fix some namespace conflicts between the RTC subsystem and the ARM Integrator time functions.
Signed-off-by Richard Purdie <[email protected]>
Applied, thanks.
Signature · 6 lines
Best regards, Alessandro Zummo, Tower Technologies - Turin, Italy http://www.towertech.it