* [PATCH -mm] RTC subsystem, Fix integrator namespace conflicts
@ 2006-03-04 22:23 Richard Purdie
2006-03-05 2:38 ` Alessandro Zummo
0 siblings, 1 reply; 2+ messages in thread
From: Richard Purdie @ 2006-03-04 22:23 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Alessandro Zummo
Fix some namespace conflicts between the RTC subsystem and the ARM
Integrator time functions.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Index: linux-2.6.15/arch/arm/mach-integrator/time.c
===================================================================
--- linux-2.6.15.orig/arch/arm/mach-integrator/time.c 2006-01-03 03:21:10.000000000 +0000
+++ linux-2.6.15/arch/arm/mach-integrator/time.c 2006-02-22 11:08:12.000000000 +0000
@@ -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)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH -mm] RTC subsystem, Fix integrator namespace conflicts
2006-03-04 22:23 [PATCH -mm] RTC subsystem, Fix integrator namespace conflicts Richard Purdie
@ 2006-03-05 2:38 ` Alessandro Zummo
0 siblings, 0 replies; 2+ messages in thread
From: Alessandro Zummo @ 2006-03-05 2:38 UTC (permalink / raw)
To: Richard Purdie; +Cc: Andrew Morton, linux-kernel
On Sat, 04 Mar 2006 22:23:26 +0000
Richard Purdie <rpurdie@rpsys.net> wrote:
> Fix some namespace conflicts between the RTC subsystem and the ARM
> Integrator time functions.
>
> Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Applied, thanks.
--
Best regards,
Alessandro Zummo,
Tower Technologies - Turin, Italy
http://www.towertech.it
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-03-05 2:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-03-04 22:23 [PATCH -mm] RTC subsystem, Fix integrator namespace conflicts Richard Purdie
2006-03-05 2:38 ` Alessandro Zummo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®