diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 20:02:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 20:02:08 -0500 |
| commit | 4222721ebb50a8640860eeca0caeb63fe1cce935 (patch) | |
| tree | d67acdb4315e611fadc64975fd1467b2389d412d /include | |
| parent | 41c57a87183a7c458d86f78966d69d4bf18ea0b7 (diff) | |
| parent | 76398f9667e8369023ed5f4847fb59e9da8b6968 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
HID: fix pb_fnmode and move it to generic HID
HID: fix hid-input mapping for Firefly Mini Remote Control
USB HID: fix hid_blacklist clash for 0x08ca/0x0010
HID: fix memleaking of collection
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 770120add15a..342b4e639acb 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
| @@ -438,7 +438,6 @@ struct hid_device { /* device report descriptor */ | |||
| 438 | struct hid_usage *, __s32); | 438 | struct hid_usage *, __s32); |
| 439 | void (*hiddev_report_event) (struct hid_device *, struct hid_report *); | 439 | void (*hiddev_report_event) (struct hid_device *, struct hid_report *); |
| 440 | #ifdef CONFIG_USB_HIDINPUT_POWERBOOK | 440 | #ifdef CONFIG_USB_HIDINPUT_POWERBOOK |
| 441 | unsigned int pb_fnmode; | ||
| 442 | unsigned long pb_pressed_fn[NBITS(KEY_MAX)]; | 441 | unsigned long pb_pressed_fn[NBITS(KEY_MAX)]; |
| 443 | unsigned long pb_pressed_numlock[NBITS(KEY_MAX)]; | 442 | unsigned long pb_pressed_numlock[NBITS(KEY_MAX)]; |
| 444 | #endif | 443 | #endif |