git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/azt3328' into for-linus
[pandora-kernel.git]
/
drivers
/
hid
/
hid-tmff.c
diff --git
a/drivers/hid/hid-tmff.c
b/drivers/hid/hid-tmff.c
index
7c1f7b5
..
fcd6ccd
100644
(file)
--- a/
drivers/hid/hid-tmff.c
+++ b/
drivers/hid/hid-tmff.c
@@
-33,11
+33,6
@@
#include "hid-ids.h"
#include "hid-ids.h"
-#include "usbhid/usbhid.h"
-
-/* Usages for thrustmaster devices I know about */
-#define THRUSTMASTER_USAGE_FF (HID_UP_GENDESK | 0xbb)
-
static const signed short ff_rumble[] = {
FF_RUMBLE,
-1
static const signed short ff_rumble[] = {
FF_RUMBLE,
-1
@@
-48,6
+43,12
@@
static const signed short ff_joystick[] = {
-1
};
-1
};
+#ifdef CONFIG_THRUSTMASTER_FF
+#include "usbhid/usbhid.h"
+
+/* Usages for thrustmaster devices I know about */
+#define THRUSTMASTER_USAGE_FF (HID_UP_GENDESK | 0xbb)
+
struct tmff_device {
struct hid_report *report;
struct hid_field *ff_field;
struct tmff_device {
struct hid_report *report;
struct hid_field *ff_field;
@@
-209,6
+210,12
@@
fail:
kfree(tmff);
return error;
}
kfree(tmff);
return error;
}
+#else
+static inline int tmff_init(struct hid_device *hid, const signed short *ff_bits)
+{
+ return 0;
+}
+#endif
static int tm_probe(struct hid_device *hdev, const struct hid_device_id *id)
{
static int tm_probe(struct hid_device *hdev, const struct hid_device_id *id)
{