summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/time.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-01-08 10:02:15 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 05:13:47 +0100
commit2a10e0b28b196051ae71829e5b989cba00513289 (patch)
tree52dfa9a64cfb3dd01fa1ee1150d589481e54e28e /arch/arm/mach-integrator/time.c
parent[PATCH] Fix and add EXPORT_SYMBOL(filemap_write_and_wait) (diff)
downloadlinux-2a10e0b28b196051ae71829e5b989cba00513289.tar.xz
linux-2a10e0b28b196051ae71829e5b989cba00513289.zip
[PATCH] move rtc_interrupt() prototype to rtc.h
This patch moves the rtc_interrupt() prototype to rtc.h and removes the prototypes from C files. It also renames static rtc_interrupt() functions in arch/arm/mach-integrator/time.c and arch/sh64/kernel/time.c to avoid compile problems. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Paul Gortmaker <p_gortmaker@yahoo.com> Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-integrator/time.c')
-rw-r--r--arch/arm/mach-integrator/time.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c
index 9f46aaef8968..3c22c16b38bf 100644
--- a/arch/arm/mach-integrator/time.c
+++ b/arch/arm/mach-integrator/time.c
@@ -96,7 +96,8 @@ static struct rtc_ops rtc_ops = {
.set_alarm = rtc_set_alarm,
};
-static irqreturn_t rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t arm_rtc_interrupt(int irq, void *dev_id,
+ struct pt_regs *regs)
{
writel(0, rtc_base + RTC_EOI);
return IRQ_HANDLED;
@@ -124,7 +125,7 @@ static int rtc_probe(struct amba_device *dev, void *id)
xtime.tv_sec = __raw_readl(rtc_base + RTC_DR);
- ret = request_irq(dev->irq[0], rtc_interrupt, SA_INTERRUPT,
+ ret = request_irq(dev->irq[0], arm_rtc_interrupt, SA_INTERRUPT,
"rtc-pl030", dev);
if (ret)
goto map_out;