Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 785cfc03 authored by Lee, Chun-Yi's avatar Lee, Chun-Yi Committed by Matthew Garrett
Browse files

Move N014, N051 and CR620 dmi information to load scm dmi table 



Found the N014, N051 and CR620 are must the same with N034 there are
load scm serial model. So, this patch move N014, N051 and CR620 dmi
information to right dmi table: msi_load_scm_models_dmi_table[]

Signed-off-by: default avatarLee, Chun-Yi <jlee@novell.com>
parent b7670ed6

drivers/platform/x86/msi-laptop.c

+15 −15
Original line number Diff line number Diff line
@@ -480,6 +480,21 @@ static struct dmi_system_id __initdata msi_dmi_table[] = { 
		},

		.callback = dmi_check_cb

	},

	{ }

};



static struct dmi_system_id __initdata msi_load_scm_models_dmi_table[] = {

	{

		.ident = "MSI N034",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR,

				"MICRO-STAR INTERNATIONAL CO., LTD"),

			DMI_MATCH(DMI_PRODUCT_NAME, "MS-N034"),

			DMI_MATCH(DMI_CHASSIS_VENDOR,

			"MICRO-STAR INTERNATIONAL CO., LTD")

		},

		.callback = dmi_check_cb

	},

	{

		.ident = "MSI N051",

		.matches = {
@@ -512,21 +527,6 @@ static struct dmi_system_id __initdata msi_dmi_table[] = { 
	{ }

};



static struct dmi_system_id __initdata msi_load_scm_models_dmi_table[] = {

	{

		.ident = "MSI N034",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR,

				"MICRO-STAR INTERNATIONAL CO., LTD"),

			DMI_MATCH(DMI_PRODUCT_NAME, "MS-N034"),

			DMI_MATCH(DMI_CHASSIS_VENDOR,

			"MICRO-STAR INTERNATIONAL CO., LTD")

		},

		.callback = dmi_check_cb

	},

	{ }

};



static int rfkill_bluetooth_set(void *data, bool blocked)

{

	/* Do something with blocked...*/