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/char/watchdog/s3c2410_wdt.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/char/watchdog/s3c2410_wdt.c')
| -rw-r--r-- | drivers/char/watchdog/s3c2410_wdt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c index b36a04ae9ab8..68b1ca976d53 100644 --- a/drivers/char/watchdog/s3c2410_wdt.c +++ b/drivers/char/watchdog/s3c2410_wdt.c | |||
| @@ -336,8 +336,7 @@ static struct miscdevice s3c2410wdt_miscdev = { | |||
| 336 | 336 | ||
| 337 | /* interrupt handler code */ | 337 | /* interrupt handler code */ |
| 338 | 338 | ||
| 339 | static irqreturn_t s3c2410wdt_irq(int irqno, void *param, | 339 | static irqreturn_t s3c2410wdt_irq(int irqno, void *param) |
| 340 | struct pt_regs *regs) | ||
| 341 | { | 340 | { |
| 342 | printk(KERN_INFO PFX "Watchdog timer expired!\n"); | 341 | printk(KERN_INFO PFX "Watchdog timer expired!\n"); |
| 343 | 342 | ||