diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-13 11:49:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-13 11:49:34 -0800 |
| commit | 6d90b4f99d62e6cf7643c7d8b48a9d7c005455bd (patch) | |
| tree | cdf7b115c0e8bca8b89969119a48412a81a2548a /drivers/input/serio | |
| parent | Merge tag 'sound-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound (diff) | |
| parent | Input: elants_i2c - avoid divide by 0 errors on bad touchscreen data (diff) | |
| download | linux-dev-6d90b4f99d62e6cf7643c7d8b48a9d7c005455bd.tar.xz linux-dev-6d90b4f99d62e6cf7643c7d8b48a9d7c005455bd.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"Small driver fixups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: elants_i2c - avoid divide by 0 errors on bad touchscreen data
Input: adxl34x - make it enumerable in ACPI environment
Input: ALPS - fix TrackStick Y axis handling for SS5 hardware
Input: synaptics-rmi4 - fix F03 build error when serio is module
Input: xpad - use correct product id for x360w controllers
Input: synaptics_i2c - change msleep to usleep_range for small msecs
Input: i8042 - add Pegatron touchpad to noloop table
Input: joydev - remove unused linux/miscdevice.h include
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 77551f522202..a7618776705a 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -211,6 +211,12 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = { DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), }, }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"), + DMI_MATCH(DMI_PRODUCT_NAME, "C15B"), + }, + }, { } }; |