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/usb/input/appletouch.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/usb/input/appletouch.c')
| -rw-r--r-- | drivers/usb/input/appletouch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/appletouch.c b/drivers/usb/input/appletouch.c index 0aa9cc2bfd69..4c213513484d 100644 --- a/drivers/usb/input/appletouch.c +++ b/drivers/usb/input/appletouch.c | |||
| @@ -210,7 +210,7 @@ static inline void atp_report_fingers(struct input_dev *input, int fingers) | |||
| 210 | input_report_key(input, BTN_TOOL_TRIPLETAP, fingers > 2); | 210 | input_report_key(input, BTN_TOOL_TRIPLETAP, fingers > 2); |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | static void atp_complete(struct urb* urb, struct pt_regs* regs) | 213 | static void atp_complete(struct urb* urb) |
| 214 | { | 214 | { |
| 215 | int x, y, x_z, y_z, x_f, y_f; | 215 | int x, y, x_z, y_z, x_f, y_f; |
| 216 | int retval, i, j; | 216 | int retval, i, j; |