diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/usb/input/hid.h | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
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 */ |