diff options
author | Jiri Kosina <jkosina@suse.cz> | 2006-12-08 12:41:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-08 13:43:19 -0500 |
commit | 4c2ae844b5ef85fd4b571c9c91ac48afa6ef2dfc (patch) | |
tree | 814a010b2a4f23de93600b2783a8286201e1d1fb /include/linux/hid.h | |
parent | aa8de2f038baec993f07ef66fb3e94481d1ec22b (diff) |
[PATCH] Generic HID layer - pb_fnmode
pb_fnmode parameter has to be passed to usbhid, both for compatibility reasons
and also because it logically belongs there.
Also removes empty hid-input.c file in drivers/usb/input.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/hid.h')
-rw-r--r-- | include/linux/hid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 342b4e639acb..770120add15a 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
@@ -438,6 +438,7 @@ 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; | ||
441 | unsigned long pb_pressed_fn[NBITS(KEY_MAX)]; | 442 | unsigned long pb_pressed_fn[NBITS(KEY_MAX)]; |
442 | unsigned long pb_pressed_numlock[NBITS(KEY_MAX)]; | 443 | unsigned long pb_pressed_numlock[NBITS(KEY_MAX)]; |
443 | #endif | 444 | #endif |