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/input/keyboard/hil_kbd.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/input/keyboard/hil_kbd.c')
| -rw-r--r-- | drivers/input/keyboard/hil_kbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c index 2e4abdc26367..c9b0b8978cd8 100644 --- a/drivers/input/keyboard/hil_kbd.c +++ b/drivers/input/keyboard/hil_kbd.c | |||
| @@ -198,7 +198,7 @@ static void hil_kbd_process_err(struct hil_kbd *kbd) { | |||
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | static irqreturn_t hil_kbd_interrupt(struct serio *serio, | 200 | static irqreturn_t hil_kbd_interrupt(struct serio *serio, |
| 201 | unsigned char data, unsigned int flags, struct pt_regs *regs) | 201 | unsigned char data, unsigned int flags) |
| 202 | { | 202 | { |
| 203 | struct hil_kbd *kbd; | 203 | struct hil_kbd *kbd; |
| 204 | hil_packet packet; | 204 | hil_packet packet; |