diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-18 23:38:50 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-18 23:38:50 -0700 |
commit | 97eb3f24352ec6632c2127b35d8087d2a809a9b9 (patch) | |
tree | 722948059bbd325bbca232269490124231df80d4 /drivers/hid/hid-roccat.h | |
parent | 439581ec07fa9cf3f519dd461a2cf41cfd3adcb4 (diff) | |
parent | def179c271ac9b5020deca798470521f14d11edd (diff) | |
download | op-kernel-dev-97eb3f24352ec6632c2127b35d8087d2a809a9b9.zip op-kernel-dev-97eb3f24352ec6632c2127b35d8087d2a809a9b9.tar.gz |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/hid/hid-roccat.h')
-rw-r--r-- | drivers/hid/hid-roccat.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hid/hid-roccat.h b/drivers/hid/hid-roccat.h index 09e864e..5784281 100644 --- a/drivers/hid/hid-roccat.h +++ b/drivers/hid/hid-roccat.h @@ -16,11 +16,12 @@ #include <linux/types.h> #if defined(CONFIG_HID_ROCCAT) || defined(CONFIG_HID_ROCCAT_MODULE) -int roccat_connect(struct hid_device *hid); +int roccat_connect(struct class *klass, struct hid_device *hid); void roccat_disconnect(int minor); int roccat_report_event(int minor, u8 const *data, int len); #else -static inline int roccat_connect(struct hid_device *hid) { return -1; } +static inline int roccat_connect(struct class *klass, + struct hid_device *hid) { return -1; } static inline void roccat_disconnect(int minor) {} static inline int roccat_report_event(int minor, u8 const *data, int len) { |