aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/usbhid/hid-core.c
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-09-18 06:23:33 -0400
committerJiri Kosina <jkosina@suse.cz>2008-10-14 17:51:01 -0400
commit76483cf4d0efbc35eaf9905a437f2f1be0221360 (patch)
tree3c5e2316ee8f8c9adb4a3fabea0ef709eb0e8f5b /drivers/hid/usbhid/hid-core.c
parent987fbc1f7d446f4bf7063d3b756ae29db80be75e (diff)
HID: remove hid-ff
hid-ff.c now calls only pidff (generic driver), the special ones are now in separate drivers. Invoke pidff on all non-special directly. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid/hid-core.c')
-rw-r--r--drivers/hid/usbhid/hid-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 4ec10aa618d..07840df56c6 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -935,7 +935,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
935 usb_set_intfdata(intf, hid); 935 usb_set_intfdata(intf, hid);
936 hid->ll_driver = &usb_hid_driver; 936 hid->ll_driver = &usb_hid_driver;
937 hid->hid_output_raw_report = usbhid_output_raw_report; 937 hid->hid_output_raw_report = usbhid_output_raw_report;
938 hid->ff_init = hid_ff_init; 938 hid->ff_init = hid_pidff_init;
939#ifdef CONFIG_USB_HIDDEV 939#ifdef CONFIG_USB_HIDDEV
940 hid->hiddev_connect = hiddev_connect; 940 hid->hiddev_connect = hiddev_connect;
941 hid->hiddev_hid_event = hiddev_hid_event; 941 hid->hiddev_hid_event = hiddev_hid_event;