tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
"A couple more driver quirks, now enabling newer trackpoints from
Synaptics for real"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: i8042 - add nopnp quirk for Acer Aspire 5 A515
Input: trackpoint - enable Synaptics trackpoints

Linus Torvalds 72af7b41 d43ca138

+9
+2
drivers/input/mouse/trackpoint.c
··· 282 282 case TP_VARIANT_ALPS: 283 283 case TP_VARIANT_ELAN: 284 284 case TP_VARIANT_NXP: 285 + case TP_VARIANT_JYT_SYNAPTICS: 286 + case TP_VARIANT_SYNAPTICS: 285 287 if (variant_id) 286 288 *variant_id = param[0]; 287 289 if (firmware_id)
+7
drivers/input/serio/i8042-x86ia64io.h
··· 721 721 DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), 722 722 }, 723 723 }, 724 + { 725 + /* Acer Aspire 5 A515 */ 726 + .matches = { 727 + DMI_MATCH(DMI_BOARD_NAME, "Grumpy_PK"), 728 + DMI_MATCH(DMI_BOARD_VENDOR, "PK"), 729 + }, 730 + }, 724 731 { } 725 732 }; 726 733