Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (72af7b41) · Commits · 戴 / test

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

drivers/input/mouse/trackpoint.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -282,6 +282,8 @@ static int trackpoint_start_protocol(struct psmouse *psmouse,
		case TP_VARIANT_ALPS:
		case TP_VARIANT_ELAN:
		case TP_VARIANT_NXP:
		case TP_VARIANT_JYT_SYNAPTICS:
		case TP_VARIANT_SYNAPTICS:
		if (variant_id)
		*variant_id = param[0];
		if (firmware_id)

drivers/input/serio/i8042-x86ia64io.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -721,6 +721,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = {
		DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
		},
		},
		{
		/* Acer Aspire 5 A515 */
		.matches = {
		DMI_MATCH(DMI_BOARD_NAME, "Grumpy_PK"),
		DMI_MATCH(DMI_BOARD_VENDOR, "PK"),
		},
		},
		{ }
		};

Admin message