diff options
author | Jiri Kosina <jkosina@suse.cz> | 2006-12-08 12:41:10 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-08 13:43:15 -0500 |
commit | aa938f7974b82cfd9ee955031987344f332b7c77 (patch) | |
tree | 21198b8aa8a4c3be76def4b57968dae816753846 /drivers/usb/input/hid-core.c | |
parent | 4916b3a57fc94664677d439b911b8aaf86c7ec23 (diff) |
[PATCH] Generic HID layer - hiddev
- hiddev is USB-only (agreed with Marcel Holtmann that Bluetooth currently
doesn't need it, and future planned interface (rawhid) will be more flexible
and usable)
- both HID and USB-hid can be now compiled as modules (wasn't possible before
hiddev was fully separated from generic HID layer)
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 'drivers/usb/input/hid-core.c')
-rw-r--r-- | drivers/usb/input/hid-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 0991c4b751a6..4fc828041d0f 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
@@ -1284,6 +1284,9 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) | |||
1284 | hid->hidinput_input_event = usb_hidinput_input_event; | 1284 | hid->hidinput_input_event = usb_hidinput_input_event; |
1285 | hid->hidinput_open = hidinput_open; | 1285 | hid->hidinput_open = hidinput_open; |
1286 | hid->hidinput_close = hidinput_close; | 1286 | hid->hidinput_close = hidinput_close; |
1287 | #ifdef CONFIG_USB_HIDDEV | ||
1288 | hid->hiddev_hid_event = hiddev_hid_event; | ||
1289 | #endif | ||
1287 | 1290 | ||
1288 | return hid; | 1291 | return hid; |
1289 | 1292 | ||