Skip to content

Commit

Permalink
Move N014, N051 and CR620 dmi information to load scm dmi table
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lee, Chun-Yi authored and Matthew Garrett committed May 20, 2010
1 parent b7670ed commit 785cfc0
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions drivers/platform/x86/msi-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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...*/
Expand Down

0 comments on commit 785cfc0

Please sign in to comment.