diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/rtc/rtc-sh.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/rtc/rtc-sh.c')
| -rw-r--r-- | drivers/rtc/rtc-sh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index d2ce0c8bb8f3..8b6efcc05058 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
| @@ -73,7 +73,7 @@ struct sh_rtc { | |||
| 73 | spinlock_t lock; | 73 | spinlock_t lock; |
| 74 | }; | 74 | }; |
| 75 | 75 | ||
| 76 | static irqreturn_t sh_rtc_interrupt(int irq, void *id, struct pt_regs *regs) | 76 | static irqreturn_t sh_rtc_interrupt(int irq, void *id) |
| 77 | { | 77 | { |
| 78 | struct platform_device *pdev = id; | 78 | struct platform_device *pdev = id; |
| 79 | struct sh_rtc *rtc = platform_get_drvdata(pdev); | 79 | struct sh_rtc *rtc = platform_get_drvdata(pdev); |
| @@ -97,7 +97,7 @@ static irqreturn_t sh_rtc_interrupt(int irq, void *id, struct pt_regs *regs) | |||
| 97 | return IRQ_HANDLED; | 97 | return IRQ_HANDLED; |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | static irqreturn_t sh_rtc_periodic(int irq, void *id, struct pt_regs *regs) | 100 | static irqreturn_t sh_rtc_periodic(int irq, void *id) |
| 101 | { | 101 | { |
| 102 | struct sh_rtc *rtc = dev_get_drvdata(id); | 102 | struct sh_rtc *rtc = dev_get_drvdata(id); |
| 103 | 103 | ||