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-at91.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/rtc/rtc-at91.c')
| -rw-r--r-- | drivers/rtc/rtc-at91.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-at91.c b/drivers/rtc/rtc-at91.c index c0714da44920..bd61e99540a3 100644 --- a/drivers/rtc/rtc-at91.c +++ b/drivers/rtc/rtc-at91.c | |||
| @@ -238,8 +238,7 @@ static int at91_rtc_proc(struct device *dev, struct seq_file *seq) | |||
| 238 | /* | 238 | /* |
| 239 | * IRQ handler for the RTC | 239 | * IRQ handler for the RTC |
| 240 | */ | 240 | */ |
| 241 | static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id, | 241 | static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id) |
| 242 | struct pt_regs *regs) | ||
| 243 | { | 242 | { |
| 244 | struct platform_device *pdev = dev_id; | 243 | struct platform_device *pdev = dev_id; |
| 245 | struct rtc_device *rtc = platform_get_drvdata(pdev); | 244 | struct rtc_device *rtc = platform_get_drvdata(pdev); |