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-sa1100.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/rtc/rtc-sa1100.c')
| -rw-r--r-- | drivers/rtc/rtc-sa1100.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 439c41aea31c..bd4d7d174ef4 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
| @@ -68,8 +68,7 @@ static int rtc_update_alarm(struct rtc_time *alrm) | |||
| 68 | return ret; | 68 | return ret; |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id, | 71 | static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id) |
| 72 | struct pt_regs *regs) | ||
| 73 | { | 72 | { |
| 74 | struct platform_device *pdev = to_platform_device(dev_id); | 73 | struct platform_device *pdev = to_platform_device(dev_id); |
| 75 | struct rtc_device *rtc = platform_get_drvdata(pdev); | 74 | struct rtc_device *rtc = platform_get_drvdata(pdev); |
| @@ -106,8 +105,7 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id, | |||
| 106 | 105 | ||
| 107 | static int rtc_timer1_count; | 106 | static int rtc_timer1_count; |
| 108 | 107 | ||
| 109 | static irqreturn_t timer1_interrupt(int irq, void *dev_id, | 108 | static irqreturn_t timer1_interrupt(int irq, void *dev_id) |
| 110 | struct pt_regs *regs) | ||
| 111 | { | 109 | { |
| 112 | struct platform_device *pdev = to_platform_device(dev_id); | 110 | struct platform_device *pdev = to_platform_device(dev_id); |
| 113 | struct rtc_device *rtc = platform_get_drvdata(pdev); | 111 | struct rtc_device *rtc = platform_get_drvdata(pdev); |