diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 21:11:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 21:11:42 -0700 |
commit | d464c92b5234227c1698862a1906827e2e398ae0 (patch) | |
tree | 85bfa3a222fd04ab6bee19d0143426c7080553d4 /drivers/hid/Kconfig | |
parent | 3b59bf081622b6446db77ad06c93fe23677bc533 (diff) | |
parent | 4a247a4119ee932e06e985e0a95a13c3eed4715b (diff) | |
download | op-kernel-dev-d464c92b5234227c1698862a1906827e2e398ae0.zip op-kernel-dev-d464c92b5234227c1698862a1906827e2e398ae0.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID updates from Jiri Kosina:
"It contains HID driver updates all over the place -- a lot of new
hardware support especially in the multitouch area, including generic
handling of all multitouch devices by the hid-multitiouch driver
automatically."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (42 commits)
HID: multitouch: add PID for Fructel product
HID: wacom: Add reporting of wheel for Intuos4 WL
HID: wacom: Replace __set_bit with input_set_capability
HID: tivo: add support for BT-version (0x1200)
HID: wacom: Reset stylus buttons - Intuos4 WL
HID: multitouch: detect serial protocol
HID: handle all multitouch devices through hid-multitouch
HID: multitouch: fix handling of buggy reports descriptors for Dell ST2220T
HID: make it possible to force hid-core claim the device
HID: multitouch: add support for eGalax 0x722a
HID: usbhid: add quirk no_get for quanta 3008 devices
HID: multitouch: add more eGalax devices
HID: multitouch: add new PID from Ideacom
HID: multitouch: add support for Atmel maXTouch 03eb:2118
HID: waltop: Add support for tablet with PID 0038
HID: waltop: Replace original rdescs with links
HID: uclogic: Replace original rdescs with links
HID: wacom: Add pad buttons reporting on Intuos4 WL
HID: wacom: report distance for Intuos4 WL
HID: kye: Add support for 3 tablets
...
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r-- | drivers/hid/Kconfig | 77 |
1 files changed, 26 insertions, 51 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index a421abd..a3d0332 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -200,11 +200,14 @@ config HID_KEYTOUCH - Keytouch IEC 60945 config HID_KYE - tristate "Kye/Genius Ergo Mouse" if EXPERT + tristate "KYE/Genius devices" depends on USB_HID - default !EXPERT ---help--- - Support for Kye/Genius Ergo Mouse. + Support for KYE/Genius devices not fully compliant with HID standard: + - Ergo Mouse + - EasyPen i405X tablet + - MousePen i608X tablet + - EasyPen M610X tablet config HID_UCLOGIC tristate "UC-Logic" @@ -257,7 +260,9 @@ config HID_LOGITECH_DJ ---help--- Say Y if you want support for Logitech Unifying receivers and devices. Unifying receivers are capable of pairing up to 6 Logitech compliant - devices to the same receiver. + devices to the same receiver. Without this driver it will be handled by + generic USB_HID driver and all incomming events will be multiplexed + into a single mouse and a single keyboard device. config LOGITECH_FF bool "Logitech force feedback support" @@ -354,7 +359,9 @@ config HID_MULTITOUCH - LG Display panels (Dell ST2220Tc) - Lumio CrystalTouch panels - MosArt dual-touch panels + - Panasonic multitouch panels - PenMount dual touch panels + - Perixx Peripad 701 touchpad - PixArt optical touch screen - Pixcir dual touch panels - Quanta panels @@ -476,59 +483,21 @@ config HID_PRIMAX HID standard. config HID_ROCCAT - tristate "Roccat special event support" - depends on USB_HID - select HID_ROCCAT_COMMON - ---help--- - Support for Roccat special events. - Say Y here if you have a Roccat mouse or keyboard and want OSD or - macro execution support. - -config HID_ROCCAT_COMMON - tristate - depends on HID_ROCCAT - -config HID_ROCCAT_ARVO - tristate "Roccat Arvo keyboard support" - depends on USB_HID - depends on HID_ROCCAT - ---help--- - Support for Roccat Arvo keyboard. - -config HID_ROCCAT_ISKU - tristate "Roccat Isku keyboard support" - depends on USB_HID - depends on HID_ROCCAT - ---help--- - Support for Roccat Isku keyboard. - -config HID_ROCCAT_KONE - tristate "Roccat Kone Mouse support" + tristate "Roccat device support" depends on USB_HID - depends on HID_ROCCAT ---help--- - Support for Roccat Kone mouse. + Support for Roccat devices. + Say Y here if you have a Roccat mouse or keyboard and want + support for its special functionalities. -config HID_ROCCAT_KONEPLUS - tristate "Roccat Kone[+] mouse support" +config HID_SAITEK + tristate "Saitek non-fully HID-compliant devices" depends on USB_HID - depends on HID_ROCCAT ---help--- - Support for Roccat Kone[+] mouse. - -config HID_ROCCAT_KOVAPLUS - tristate "Roccat Kova[+] mouse support" - depends on USB_HID - depends on HID_ROCCAT - ---help--- - Support for Roccat Kova[+] mouse. + Support for Saitek devices that are not fully compliant with the + HID standard. -config HID_ROCCAT_PYRA - tristate "Roccat Pyra mouse support" - depends on USB_HID - depends on HID_ROCCAT - ---help--- - Support for Roccat Pyra mouse. + Currently only supports the PS1000 controller. config HID_SAMSUNG tristate "Samsung InfraRed remote control or keyboards" @@ -594,6 +563,12 @@ config SMARTJOYPLUS_FF Say Y here if you have a SmartJoy PLUS PS2/USB adapter and want to enable force feedback support for it. +config HID_TIVO + tristate "TiVo Slide Bluetooth remote control support" + depends on (USB_HID || BT_HIDP) + ---help--- + Say Y if you have a TiVo Slide Bluetooth remote control. + config HID_TOPSEED tristate "TopSeed Cyberlink, BTC Emprex, Conceptronic remote control support" depends on USB_HID |