From 785cfc0324b9321efb85b0935af2b474d615daa1 Mon Sep 17 00:00:00 2001 From: "Lee, Chun-Yi" Date: Wed, 19 May 2010 20:03:05 +0800 Subject: [PATCH] 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 --- drivers/platform/x86/msi-laptop.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index 704b5faac599..afd762b58ad9 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/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...*/