diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 13:45:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 13:45:49 -0700 |
| commit | b322b7816908487c08b89b72f838174c37d8c836 (patch) | |
| tree | 8fde3f20bf6fb97b91fd3f88e032251f0c569d00 /drivers/hid/hid-gaff.c | |
| parent | f44c2c9e073a578b2946bcf4127ffb041ee765b8 (diff) | |
| parent | 6341de0527c26ea1eaf7b7918e1df98f99e1a525 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: fix inverted wheel for bluetooth version of apple mighty mouse
HID: no more reinitializtion is needed in post_reset
HID: hidraw -- fix comment about accepted devices
HID: Multitouch support for the N-Trig touchscreen
HID: add new multitouch and digitizer contants
HID: autocentering support for Logitech Force 3D Pro
HID: fix hid-ff drivers so that devices work even without ff support
HID: force feedback support for SmartJoy PLUS PS2/USB adapter
HID: Wacom Graphire Bluetooth driver
HID: autocentering support for Logitech G25 Racing Wheel
Diffstat (limited to 'drivers/hid/hid-gaff.c')
| -rw-r--r-- | drivers/hid/hid-gaff.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/hid-gaff.c b/drivers/hid/hid-gaff.c index 510ad3ab8d3..8a11ccddaf2 100644 --- a/drivers/hid/hid-gaff.c +++ b/drivers/hid/hid-gaff.c @@ -31,6 +31,8 @@ #include <linux/usb.h> #include <linux/hid.h> #include "hid-ids.h" + +#ifdef CONFIG_GREENASIA_FF #include "usbhid/usbhid.h" struct gaff_device { @@ -130,6 +132,12 @@ static int gaff_init(struct hid_device *hid) return 0; } +#else +static inline int gaff_init(struct hid_device *hdev) +{ + return 0; +} +#endif static int ga_probe(struct hid_device *hdev, const struct hid_device_id *id) { |