diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 15:23:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 15:23:49 -0700 |
| commit | 5cf65713f87775c548e3eb48dbafa32e12f28000 (patch) | |
| tree | 117442e28cddebb79246b1c4b871428e50b27fb1 /drivers/hid/hid-roccat.h | |
| parent | b7c8e55db7141dcbb9d5305a3260fa0ed62a1bcc (diff) | |
| parent | 9f17d516416c88dfe18f4deee508fce763ddedb5 (diff) | |
| download | talos-op-linux-5cf65713f87775c548e3eb48dbafa32e12f28000.tar.gz talos-op-linux-5cf65713f87775c548e3eb48dbafa32e12f28000.zip | |
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: (30 commits)
Revert "HID: add support for the Wacom Intuos 4 wireless"
HID: fix up Kconfig entry for ACRUX driver
HID: add ACRUX game controller force feedback support
HID: Force input registration for "VEC footpedal"
HID: add HID_QUIRK_HIDINPUT_FORCE
HID: hid-input.c: indentation fixes
HID: hiddev: use usb_find_interface, get rid of BKL
HID: ignore digitizer usage Undefined (0x00)
HID: Add support for Conceptronic CLLRCMCE
HID: hid-ids.h: Whitespace fixup, align using TABs
HID: picolcd: implement refcounting of framebuffer
HID: picolcd: do not reallocate memory on depth change
HID: picolcd: Add minimal palette required by fbcon on 8bpp
HID: magicmouse: Correct parsing of large X and Y motions.
HID: magicmouse: report last touch up
HID: picolcd: fix deferred_io init/cleanup to fb ordering
HID: hid-ids.h: keep vendor ids in alphabetical order
HID: add proper support for Elecom BM084 bluetooth mouse
HID: magicmouse: enable horizontal scrolling
HID: magicmouse: add param for scroll speed
...
Diffstat (limited to 'drivers/hid/hid-roccat.h')
| -rw-r--r-- | drivers/hid/hid-roccat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-roccat.h b/drivers/hid/hid-roccat.h index d8aae0c1fa7e..09e864e9f79d 100644 --- a/drivers/hid/hid-roccat.h +++ b/drivers/hid/hid-roccat.h @@ -15,7 +15,7 @@ #include <linux/hid.h> #include <linux/types.h> -#if defined(CONFIG_HID_ROCCAT) || defined (CONFIG_HID_ROCCAT_MODULE) +#if defined(CONFIG_HID_ROCCAT) || defined(CONFIG_HID_ROCCAT_MODULE) int roccat_connect(struct hid_device *hid); void roccat_disconnect(int minor); int roccat_report_event(int minor, u8 const *data, int len); |
