diff options
author | Paul Mackerras <paulus@samba.org> | 2008-12-03 10:11:06 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-12-03 10:11:06 +0100 |
commit | 527491885554002837b5742202adc0ab5f536e54 (patch) | |
tree | 6d9c44776e0b4368eccd414b92b957fac3c5a4c6 /Documentation/input/input-programming.txt | |
parent | Merge branch 'linux-2.6' into next (diff) | |
parent | powerpc: Fix dma_map_sg() cache flushing on non coherent platforms (diff) | |
download | linux-527491885554002837b5742202adc0ab5f536e54.tar.xz linux-527491885554002837b5742202adc0ab5f536e54.zip |
Merge branch 'merge'
Diffstat (limited to 'Documentation/input/input-programming.txt')
-rw-r--r-- | Documentation/input/input-programming.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/input/input-programming.txt b/Documentation/input/input-programming.txt index 81905e81585e..7f8b9d97bc47 100644 --- a/Documentation/input/input-programming.txt +++ b/Documentation/input/input-programming.txt @@ -20,10 +20,11 @@ pressed or released a BUTTON_IRQ happens. The driver could look like: static struct input_dev *button_dev; -static void button_interrupt(int irq, void *dummy, struct pt_regs *fp) +static irqreturn_t button_interrupt(int irq, void *dummy) { input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1); input_sync(button_dev); + return IRQ_HANDLED; } static int __init button_init(void) |