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

drivers/input/mouse/trackpoint.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ static const char * const trackpoint_variants[] = {
		[TP_VARIANT_ALPS] = "ALPS",
		[TP_VARIANT_ELAN] = "Elan",
		[TP_VARIANT_NXP] = "NXP",
		[TP_VARIANT_JYT_SYNAPTICS] = "JYT_Synaptics",
		[TP_VARIANT_SYNAPTICS] = "Synaptics",
		};

		/*

+6 −4

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@
		#define TP_VARIANT_ALPS 0x02
		#define TP_VARIANT_ELAN 0x03
		#define TP_VARIANT_NXP 0x04
		#define TP_VARIANT_JYT_SYNAPTICS 0x05
		#define TP_VARIANT_SYNAPTICS 0x06

		/*
		* Commands

+16 −0

Original line number	Diff line number	Diff line
		@@ -548,6 +548,14 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = {
		DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
		},
		},
		{
		/* Entroware Proteus */
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Entroware"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"),
		},
		},
		{ }
		};

		@@ -676,6 +684,14 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
		DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
		},
		},
		{
		/* Entroware Proteus */
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Entroware"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"),
		},
		},
		{ }
		};