summaryrefslogtreecommitdiff
path: root/include/linux/hid.h
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-09-18 14:23:33 +0400
committerJiri Kosina <jkosina@suse.cz>2008-10-15 01:51:01 +0400
commit76483cf4d0efbc35eaf9905a437f2f1be0221360 (patch)
tree3c5e2316ee8f8c9adb4a3fabea0ef709eb0e8f5b /include/linux/hid.h
parent987fbc1f7d446f4bf7063d3b756ae29db80be75e (diff)
downloadlinux-76483cf4d0efbc35eaf9905a437f2f1be0221360.tar.xz
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 'include/linux/hid.h')
-rw-r--r--include/linux/hid.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 0773ba6a66f2..dcdef0bb4bba 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -757,17 +757,10 @@ int usbhid_quirks_init(char **quirks_param);
void usbhid_quirks_exit(void);
void usbhid_set_leds(struct hid_device *hid);
-#ifdef CONFIG_HID_FF
-int hid_ff_init(struct hid_device *hid);
-
#ifdef CONFIG_HID_PID
int hid_pidff_init(struct hid_device *hid);
#else
-static inline int hid_pidff_init(struct hid_device *hid) { return -ENODEV; }
-#endif
-
-#else
-#define hid_ff_init NULL
+#define hid_pidff_init NULL
#endif
#ifdef CONFIG_HID_DEBUG