diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
| commit | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (patch) | |
| tree | aa1a9cc1e79ae66f6cbb0fe39d79a80ca76331e8 /drivers/usb/input/hid.h | |
| parent | c45154a3b1fecdbb51b5462c9f730b44e62b83a5 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/input/hid.h')
| -rw-r--r-- | drivers/usb/input/hid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/hid.h b/drivers/usb/input/hid.h index ec2412c42f1e..ee48a2276104 100644 --- a/drivers/usb/input/hid.h +++ b/drivers/usb/input/hid.h | |||
| @@ -371,7 +371,7 @@ struct hid_control_fifo { | |||
| 371 | struct hid_input { | 371 | struct hid_input { |
| 372 | struct list_head list; | 372 | struct list_head list; |
| 373 | struct hid_report *report; | 373 | struct hid_report *report; |
| 374 | struct input_dev input; | 374 | struct input_dev *input; |
| 375 | }; | 375 | }; |
| 376 | 376 | ||
| 377 | struct hid_device { /* device report descriptor */ | 377 | struct hid_device { /* device report descriptor */ |