diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-18 20:48:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-18 20:48:30 -0700 |
| commit | f77fb2ba7bbf75253b45db5eba8f576d39244a4d (patch) | |
| tree | 8fac1552b1a38546e143e8a2d00a1927e6d98349 /drivers/char | |
| parent | e7778aa6f31831fddb810517f950ba87787dfedd (diff) | |
| parent | 25a49b8e26e6e5e81aa33b664e66bfe515e5927d (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.5-rmk
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/nwbutton.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/nwbutton.h b/drivers/char/nwbutton.h index 5f5c8ddd041f..a59a045af441 100644 --- a/drivers/char/nwbutton.h +++ b/drivers/char/nwbutton.h @@ -25,7 +25,7 @@ struct button_callback { /* Function prototypes: */ static void button_sequence_finished (unsigned long parameters); -static void button_handler (int irq, void *dev_id, struct pt_regs *regs); +static irqreturn_t button_handler (int irq, void *dev_id, struct pt_regs *regs); static int button_read (struct file *filp, char *buffer, size_t count, loff_t *ppos); int button_init (void); |