Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit72af7b4

Browse files
committed
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
2 parentsd43ca13 +5fc27b0 commit72af7b4

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

‎drivers/input/mouse/trackpoint.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse,
282282
caseTP_VARIANT_ALPS:
283283
caseTP_VARIANT_ELAN:
284284
caseTP_VARIANT_NXP:
285+
caseTP_VARIANT_JYT_SYNAPTICS:
286+
caseTP_VARIANT_SYNAPTICS:
285287
if (variant_id)
286288
*variant_id=param[0];
287289
if (firmware_id)

‎drivers/input/serio/i8042-x86ia64io.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = {
721721
DMI_MATCH(DMI_BOARD_VENDOR,"MICRO-STAR INTERNATIONAL CO., LTD"),
722722
},
723723
},
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+
},
724731
{ }
725732
};
726733

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp