diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2003-05-17 21:03:31 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2003-05-17 21:03:31 +0100 |
| commit | af7dbd5e2b7aa98162bfe14e7ed78ca1950e0177 (patch) | |
| tree | 14b558615645835484570993ea9863a011f87e27 /drivers/char | |
| parent | 23d2f9928a0d6cace2ca67b6c10f55ecbce91069 (diff) | |
| parent | 1b473f0993f3f90b7db099a805514cfcbb61b680 (diff) | |
[ARM] Merge Linus' tree with current ARM tree.
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); |