summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2014-08-081-4/+9
|\
| * Input: HID - remove hid-wacom Bluetooth driverBenjamin Tissoires2014-08-061-9/+1
| * Input: wacom - move the USB (now hid) Wacom driver in drivers/hidBenjamin Tissoires2014-07-251-0/+13
* | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cool...Linus Torvalds2014-08-071-0/+14
|\ \
| * | HID: add support for MSI GT683R led panelsJanne Kanniainen2014-07-011-0/+14
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'for-3.17/upstream', 'for-3.17/cp2112', 'for-3.17/huion', 'for...Jiri Kosina2014-08-061-8/+10
|\ \ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | | * HID: lenovo: Add support for Compact (BT|USB) keyboardJamie Lentin2014-07-291-0/+2
| | | * HID: lenovo: Rename hid-lenovo-tpkbd to hid-lenovoJamie Lentin2014-07-291-7/+7
| | |/
| | * HID: sensor-hub: introduce Kconfig dependency on IOMEMChen Gang2014-06-111-1/+1
| |/
* / HID: Kconfig: drop remove Unicode non-breaking space from KconfigBrian Norris2014-06-111-1/+1
|/
*-. Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-...Jiri Kosina2014-06-041-0/+8
|\ \
| | * HID: rmi: introduce RMI driver for Synaptics touchpadsBenjamin Tissoires2014-04-091-0/+8
| |/
* / HID: quirk for Saitek RAT7 and MMO7 mices' mode buttonHarald Brinkmann2014-05-201-1/+4
|/
* Merge branch 'for-3.15/sony' into for-3.15/hid-core-ll-transport-cleanupJiri Kosina2014-03-141-4/+6
|\
| * HID: Kconfig updates for the Sony moduleFrank Praznik2014-02-041-4/+5
| * HID: sony: fix build wrt. power_supplyJiri Kosina2014-02-031-0/+1
* | HID: cp2112: can't be used without gpio supportJiri Kosina2014-02-181-1/+1
* | HID: add hid-cp2112 driverDavid Barksdale2014-02-171-0/+9
|/
*-. Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/senso...Jiri Kosina2014-01-221-0/+1
|\ \
| | * HID: logitech-dj: add HIDRAW dependency in KconfigOlivier Gay2013-12-031-0/+1
| |/
* / HID: multicouh: add PID VID to support 1 new Wistron optical touch deviceKaiChung Cheng2013-11-211-0/+1
|/
*-----. Merge branches 'for-3.12/upstream-fixes', 'for-3.13/holtek', 'for-3.13/i2c-hi...Jiri Kosina2013-11-161-5/+16
|\ \ \ \
| | | | * HID: sony: Add force feedback support for Dualshock3 USBSven Eckelmann2013-11-111-0/+8
| | | | * HID: lenovo-tpkbd: remove usb dependencyBenjamin Tissoires2013-09-241-1/+1
| | | * | HID: multitouch: add manufacturer to Kconfig help textJan Matějka2013-10-301-0/+1
| | | * | HID: hid-multitouch: add support for SiS panelsForest Bond2013-10-251-0/+1
| | | |/
| | * | HID: Correct Kconfig MOMO descriptionSimon Wood2013-10-141-1/+0
| | * | HID: logitech - lg2ff: Add IDs for Formula Vibration Feedback WheelElias Vanderstuyft2013-10-091-3/+5
| |/ /
* / / HID: add support for LEETGION Hellion Gaming MouseAnders F. U. Kiær2013-10-251-0/+1
|/ /
* / HID: add Holtek USB ID 04d9:a081 SHARKOON DarkGliderAnders F. U. Kiær2013-10-021-0/+1
|/
* Remove GENERIC_HARDIRQ config optionMartin Schwidefsky2013-09-131-1/+1
* HID: Add new driver for non-compliant Xin-Mo devices.Olivier Scherler2013-07-291-0/+8
*-. Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linusJiri Kosina2013-07-041-10/+17
|\ \
| | * HID: wiimote: remove old static extension supportDavid Herrmann2013-06-031-9/+0
| | * HID: wiimote: extend driver descriptionDavid Herrmann2013-06-031-2/+18
| |/
| |
| \
| \
| \
*---. \ Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream'...Jiri Kosina2013-07-041-12/+14
|\ \ \ \ | | |_|/ | |/| |
| | | * HID: add support for Huion 580 tabletMartin Rusko2013-05-281-0/+6
| | |/ | |/|
| | * HID: fold ps3remote driver into generic Sony driverJiri Kosina2013-06-131-12/+3
| | * HID: sony: fix leds dependencyJiri Kosina2013-05-281-2/+2
| | * HID: driver for PS2/3 Buzz controllersColin Leitner2013-05-281-2/+7
| |/
| |
| \
*-. \ Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for...Jiri Kosina2013-07-041-0/+10
|\ \ \ | |_|/ |/| |
| | * HID: Add support for Holtek gaming mouse 04d9:a04aChristian Ohm2013-05-281-0/+2
| | * HID: Add driver for Holtek gaming mouse 04d9:a067Christian Ohm2013-05-281-0/+1
| |/ |/|
| * HID: add driver for ELO 4000/4500Jiri Slaby2013-05-291-0/+7
|/
*-. Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstrea...Jiri Kosina2013-04-301-4/+4
|\ \
| | * HID: clarify Magic Mouse Kconfig descriptionDavid King2013-04-211-3/+3
| | * HID: Kconfig: fix "-- help---"Paul Bolle2013-03-051-1/+1
| |/
| |
| \
*-. \ Merge branches 'for-3.10/appleir', 'for-3.10/hid-debug', 'for-3.10/hid-driver...Jiri Kosina2013-04-301-49/+49
|\ \ \ | | |/ | |/|
| | * HID: holtek: Holtek devices depends on USB_HIDBenjamin Tissoires2013-03-071-1/+1
| | * HID: use hid_hw_wait() instead of direct call to usbhidBenjamin Tissoires2013-02-251-1/+1