diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/rtc/rtc-at91.c | |
parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
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); |