浏览代码

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: Lee, Chun-Yi <jlee@novell.com>
Lee, Chun-Yi 15 年之前
父节点
当前提交
785cfc0324
共有 1 个文件被更改,包括 15 次插入15 次删除
  1. 15 15
      drivers/platform/x86/msi-laptop.c

+ 15 - 15
drivers/platform/x86/msi-laptop.c

@@ -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...*/