diff options
| author | Lee, Chun-Yi <jlee@novell.com> | 2010-05-19 20:03:05 +0800 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-05-20 10:16:13 -0400 |
| commit | 785cfc0324b9321efb85b0935af2b474d615daa1 (patch) | |
| tree | 365defd20d88d779a506e9031c51e4db9ea310f4 /drivers/platform | |
| parent | b7670ed6509f322713bbd96eed0301c322f2ae02 (diff) | |
| download | lwn-785cfc0324b9321efb85b0935af2b474d615daa1.tar.gz lwn-785cfc0324b9321efb85b0935af2b474d615daa1.zip | |
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>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/msi-laptop.c | 30 |
1 files 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...*/ |