projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[powerpc.git]
/
drivers
/
rtc
/
rtc-vr41xx.c
diff --git
a/drivers/rtc/rtc-vr41xx.c
b/drivers/rtc/rtc-vr41xx.c
index
58e5ed0
..
e40322b
100644
(file)
--- a/
drivers/rtc/rtc-vr41xx.c
+++ b/
drivers/rtc/rtc-vr41xx.c
@@
-268,7
+268,7
@@
static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long
return 0;
}
return 0;
}
-static irqreturn_t elapsedtime_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t elapsedtime_interrupt(int irq, void *dev_id)
{
struct platform_device *pdev = (struct platform_device *)dev_id;
struct rtc_device *rtc = platform_get_drvdata(pdev);
{
struct platform_device *pdev = (struct platform_device *)dev_id;
struct rtc_device *rtc = platform_get_drvdata(pdev);
@@
-280,7
+280,7
@@
static irqreturn_t elapsedtime_interrupt(int irq, void *dev_id, struct pt_regs *
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static irqreturn_t rtclong1_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t rtclong1_interrupt(int irq, void *dev_id)
{
struct platform_device *pdev = (struct platform_device *)dev_id;
struct rtc_device *rtc = platform_get_drvdata(pdev);
{
struct platform_device *pdev = (struct platform_device *)dev_id;
struct rtc_device *rtc = platform_get_drvdata(pdev);