aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLee, Chun-Yi <jlee@novell.com>2010-05-19 08:03:05 -0400
committerMatthew Garrett <mjg@redhat.com>2010-05-20 10:16:13 -0400
commit785cfc0324b9321efb85b0935af2b474d615daa1 (patch)
tree365defd20d88d779a506e9031c51e4db9ea310f4 /drivers
parentb7670ed6509f322713bbd96eed0301c322f2ae02 (diff)
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')
-rw-r--r--drivers/platform/x86/msi-laptop.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index 704b5faac59..afd762b58ad 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[] = {
480 }, 480 },
481 .callback = dmi_check_cb 481 .callback = dmi_check_cb
482 }, 482 },
483 { }
484};
485
486static struct dmi_system_id __initdata msi_load_scm_models_dmi_table[] = {
487 {
488 .ident = "MSI N034",
489 .matches = {
490 DMI_MATCH(DMI_SYS_VENDOR,
491 "MICRO-STAR INTERNATIONAL CO., LTD"),
492 DMI_MATCH(DMI_PRODUCT_NAME, "MS-N034"),
493 DMI_MATCH(DMI_CHASSIS_VENDOR,
494 "MICRO-STAR INTERNATIONAL CO., LTD")
495 },
496 .callback = dmi_check_cb
497 },
483 { 498 {
484 .ident = "MSI N051", 499 .ident = "MSI N051",
485 .matches = { 500 .matches = {
@@ -512,21 +527,6 @@ static struct dmi_system_id __initdata msi_dmi_table[] = {
512 { } 527 { }
513}; 528};
514 529
515static struct dmi_system_id __initdata msi_load_scm_models_dmi_table[] = {
516 {
517 .ident = "MSI N034",
518 .matches = {
519 DMI_MATCH(DMI_SYS_VENDOR,
520 "MICRO-STAR INTERNATIONAL CO., LTD"),
521 DMI_MATCH(DMI_PRODUCT_NAME, "MS-N034"),
522 DMI_MATCH(DMI_CHASSIS_VENDOR,
523 "MICRO-STAR INTERNATIONAL CO., LTD")
524 },
525 .callback = dmi_check_cb
526 },
527 { }
528};
529
530static int rfkill_bluetooth_set(void *data, bool blocked) 530static int rfkill_bluetooth_set(void *data, bool blocked)
531{ 531{
532 /* Do something with blocked...*/ 532 /* Do something with blocked...*/