diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/usb/input/hiddev.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/input/hiddev.c')
| -rw-r--r-- | drivers/usb/input/hiddev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c index a2b419d13740..7dc14d0cacc1 100644 --- a/drivers/usb/input/hiddev.c +++ b/drivers/usb/input/hiddev.c | |||
| @@ -179,7 +179,7 @@ static void hiddev_send_event(struct hid_device *hid, | |||
| 179 | * the interrupt pipe | 179 | * the interrupt pipe |
| 180 | */ | 180 | */ |
| 181 | void hiddev_hid_event(struct hid_device *hid, struct hid_field *field, | 181 | void hiddev_hid_event(struct hid_device *hid, struct hid_field *field, |
| 182 | struct hid_usage *usage, __s32 value, struct pt_regs *regs) | 182 | struct hid_usage *usage, __s32 value) |
| 183 | { | 183 | { |
| 184 | unsigned type = field->report_type; | 184 | unsigned type = field->report_type; |
| 185 | struct hiddev_usage_ref uref; | 185 | struct hiddev_usage_ref uref; |