diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 01:32:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 01:32:01 +0200 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/char/tlclk.c | |
| parent | [PATCH] UDF: Fix mounting read-write (diff) | |
| parent | IRQ: Maintain regs pointer globally rather than passing to IRQ handlers (diff) | |
| download | linux-44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3.tar.xz linux-44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3.zip | |
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/tlclk.c')
| -rw-r--r-- | drivers/char/tlclk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c index d2c5ba4e83b8..2444a0e24b31 100644 --- a/drivers/char/tlclk.c +++ b/drivers/char/tlclk.c @@ -193,7 +193,7 @@ static DEFINE_SPINLOCK(event_lock); static int tlclk_major = TLCLK_MAJOR; -static irqreturn_t tlclk_interrupt(int irq, void *dev_id, struct pt_regs *regs); +static irqreturn_t tlclk_interrupt(int irq, void *dev_id); static DECLARE_WAIT_QUEUE_HEAD(wq); @@ -856,7 +856,7 @@ static void switchover_timeout(unsigned long data) wake_up(&wq); } -static irqreturn_t tlclk_interrupt(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t tlclk_interrupt(int irq, void *dev_id) { unsigned long flags; |