Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197570
b: refs/heads/master
c: 785cfc0
h: refs/heads/master
v: v3
  • Loading branch information
Lee, Chun-Yi authored and Matthew Garrett committed May 20, 2010
1 parent b14095c commit bb7b587
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b7670ed6509f322713bbd96eed0301c322f2ae02
refs/heads/master: 785cfc0324b9321efb85b0935af2b474d615daa1
30 changes: 15 additions & 15 deletions trunk/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 bb7b587

Please sign in to comment.