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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
hid
/
hid-drff.c
diff --git
a/drivers/hid/hid-drff.c
b/drivers/hid/hid-drff.c
index
34f3eb6
..
a239d20
100644
(file)
--- a/
drivers/hid/hid-drff.c
+++ b/
drivers/hid/hid-drff.c
@@
-32,6
+32,8
@@
#include <linux/hid.h>
#include "hid-ids.h"
#include <linux/hid.h>
#include "hid-ids.h"
+
+#ifdef CONFIG_DRAGONRISE_FF
#include "usbhid/usbhid.h"
struct drff_device {
#include "usbhid/usbhid.h"
struct drff_device {
@@
-135,6
+137,12
@@
static int drff_init(struct hid_device *hid)
return 0;
}
return 0;
}
+#else
+static inline int drff_init(struct hid_device *hid)
+{
+ return 0;
+}
+#endif
static int dr_probe(struct hid_device *hdev, const struct hid_device_id *id)
{
static int dr_probe(struct hid_device *hdev, const struct hid_device_id *id)
{