diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-08 09:00:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-08 09:00:43 -0800 |
| commit | c6400e5cef5eafc259e649ceedc4c7eecc9069d8 (patch) | |
| tree | c6696fc140f6e10130baf8cad6705677882fda57 /drivers/hid/hid-input.c | |
| parent | b7af27bf9471f5d54d71dc2e4228d6bc065bdb57 (diff) | |
| parent | 49374f006191edad94c5273b2684e6be27792099 (diff) | |
| download | talos-op-linux-c6400e5cef5eafc259e649ceedc4c7eecc9069d8.tar.gz talos-op-linux-c6400e5cef5eafc259e649ceedc4c7eecc9069d8.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
Pull HID updates from Jiri Kosina:
- support for Pro Pen slim, from Jason Gerecke
- power management improvements to Intel-ISH driver, from Song Hongyan
- UCLogic driver revamp in order to be able to support wider range of
Huion tablets, from Nikolai Kondrashov
- Asus Transbook support, from NOGUCHI Hiroshi
- other assorted small bugfixes / cleanups and device ID additions
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (46 commits)
HID: Remove Waltop tablets from hid_have_special_driver
HID: Remove KYE tablets from hid_have_special_driver
HID: Remove hid-uclogic entries from hid_have_special_driver
HID: uclogic: Do not initialize non-USB devices
HID: uclogic: Add support for Ugee G5
HID: uclogic: Support Gray-coded rotary encoders
HID: uclogic: Support faking Wacom pad device ID
HID: uclogic: Add support for XP-Pen Deco 01
HID: uclogic: Add support for XP-Pen Star G640
HID: uclogic: Add support for XP-Pen Star G540
HID: uclogic: Add support for Ugee EX07S frame controls
HID: uclogic: Add support for Ugee M540
HID: uclogic: Add support for Ugee 2150
HID: uclogic: Support v2 protocol
HID: uclogic: Support fragmented high-res reports
HID: uclogic: Support in-range reporting emulation
HID: uclogic: Designate current protocol v1
HID: uclogic: Re-initialize tablets on resume
HID: uclogic: Extract tablet parameter discovery into a module
HID: uclogic: Extract report descriptors to a module
...
Diffstat (limited to 'drivers/hid/hid-input.c')
| -rw-r--r-- | drivers/hid/hid-input.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 59a5608b8dc0..b10b1922c5bd 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -328,6 +328,9 @@ static const struct hid_device_id hid_battery_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_3), HID_BATTERY_QUIRK_IGNORE }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ASUSTEK, + USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD), + HID_BATTERY_QUIRK_IGNORE }, {} }; |
