summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Kconfig
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2012-06-261-23/+20
|\ \
| * | HID: Fix the generic Kconfig optionsHenrik Rydberg2012-06-251-23/+20
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-05-221-1/+1
|\ \ | |/ |/|
| * Fix typo in various Kconfig fileMasanari Iida2012-04-161-1/+1
| |
| \
| \
| \
*---. \ Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linusJiri Kosina2012-05-221-9/+7
|\ \ \ \ | | | |/
| | * | HID: wacom: fix build breakage without CONFIG_LEDS_CLASSDavid Rientjes2012-05-211-1/+1
| | * | HID: wacom: Add LED selector control for Wacom Intuos4 WLPrzemo Firszt2012-05-111-0/+1
| | * | HID: wacom: Fix HID_WACOM self-dependencyPrzemo Firszt2012-03-291-1/+0
| | * | HID: wacom: Change HID_WACOM option description.Przemo Firszt2012-03-281-1/+1
| | * | HID: wacom: Remove CONFIG_HID_WACOM_POWER_SUPPLY optionPrzemo Firszt2012-03-281-7/+1
| | |/
| * | HID: add Kconfig text to HID_BATTERY_STRENGTHJiri Kosina2012-04-241-1/+5
* | | Merge branch 'upstream' into for-linusJiri Kosina2012-05-221-0/+6
|\ \ \
| * | | HID: Aureal Remote Control Device DriverJosenivaldo Benito Junior2012-04-131-0/+6
| | |/ | |/|
* | | HID: Create a common generic driverHenrik Rydberg2012-05-011-0/+12
| |/ |/|
* | HID: default HID_BATTERY_STRENGTH to noJosh Boyer2012-04-191-1/+1
|/
* Merge branch 'upstream' into for-linusJiri Kosina2012-03-201-4/+24
|\
| * HID: tivo: add support for BT-version (0x1200)Jiri Kosina2012-03-131-1/+1
| * HID: kye: Add support for 3 tabletsNikolai Kondrashov2012-02-281-3/+6
| * HID: add new driver for non-compliant Saitek devicesAndreas Hübner2012-02-221-0/+9
| * HID: use generic driver for Logitech Unifying receivers if !CONFIG_HID_LOGITE...Konstantin Khlebnikov2012-02-211-1/+3
| * HID: tivo: fix broken buildJiri Kosina2012-02-061-1/+1
| * HID: add support for tivo slide remoteJarod Wilson2012-02-061-0/+6
| |
| \
*-. \ Merge branches 'roccat' and 'wacom' into for-linusJiri Kosina2012-03-201-51/+4
|\ \ \ | | |/
| * | HID: roccat: Only one Kconfig entry for all roccat driversStefan Achatz2012-02-051-51/+4
| |/
* | HID: multitouch: add support of Panasonic multitouch panelsDenis Kovalev2012-02-211-0/+1
* | HID: multitouch: support Perixx PERIPAD 701Benjamin Tissoires2012-02-061-0/+1
|/
*---------. Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', 'upstream-fixes'...Jiri Kosina2012-01-051-6/+26
|\ \ \ \ \ \
| | | | | | * HID: wiimote: Add extension support stubDavid Herrmann2011-11-221-0/+9
| | | | | |/
| | | | * | HID: wiimote: Select INPUT_FF_MEMLESSDavid Herrmann2011-12-121-0/+1
| | | | |/
| | | * | HID: Kconfig: fix syntaxJiri Kosina2011-12-191-1/+1
| | | * | HID: introduce proper dependency of HID_BATTERY on POWER_SUPPLYJiri Kosina2011-12-161-1/+1
| | | * | HID: hid-input: add support for HID devices reporting Battery StrengthJeremy Fitzhardinge2011-11-281-0/+5
| | | |/
| | * | HID: roccat: Add support for Isku keyboardStefan Achatz2011-12-061-0/+7
| | |/
| * | HID: hid-multitouch: add support 9 new Xiroku devicesMasatoshi Hoshikawa2012-01-051-0/+1
| * | HID: multitouch: add support of Atmel multitouch panelsBenjamin Tissoires2012-01-021-0/+1
| * | HID: multitouch: support PixArt optical touch screenAaron Tian2011-12-151-0/+1
| * | HID: multitouch: merge quanta driver into hid-multitouchBenjamin Tissoires2011-11-301-6/+1
| |/
* | HID: hyperv: fixup Kconfig / Makefile entriesJiri Kosina2011-11-221-6/+6
* | HID: Move the hid-hyperv driver out of stagingK. Y. Srinivasan2011-11-221-0/+6
|/
* Merge branch 'upstream' into for-linusJiri Kosina2011-10-251-1/+12
|\
| * HID: Add device IDs for more SJOY adaptersSean Young2011-10-211-1/+5
| * HID: primax: remove spurious dependencyJiri Kosina2011-10-171-2/+1
| * HID: support primax keyboards violating USB HID specTerry Lambert2011-10-171-0/+8
| |
| \
| \
| \
| \
| \
*-----. \ Merge branches 'acrux', 'logitech', 'multitouch', 'roccat' and 'wiimote' into...Jiri Kosina2011-10-251-5/+24
|\ \ \ \ \
| | | | * | HID: wiimote: Read wiimote battery charge levelDavid Herrmann2011-09-071-0/+1
| |_|_|/ / |/| | | |
| | | * | HID: hid-multitouch: Add LG Display Multitouch device.Jeff Brown2011-08-161-0/+1
| | | |/
| | * | HID: Add full support for Logitech Unifying receiversNestor Lopez Casado2011-09-151-0/+9
| | * | HID: make CONFIG_LOGIWHEELS_FF default to CONFIG_LOGITECH_FFJiri Kosina2011-08-101-0/+1
| | * | HID: lg4ff - Fix misleading info in KconfigMichal Malý2011-08-041-4/+11
| | |/
| * | HID: ACRUX - fix enabling force feedback supportSergei Kolzun2011-08-041-1/+1
| |/
OpenPOWER on IntegriCloud