diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
| commit | 438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch) | |
| tree | 76941991e36f4a32bf1be0db3854959053f24619 /drivers/acpi/ec.c | |
| parent | 9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff) | |
Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index f31291ba94d0..7bff18b33089 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
| @@ -929,6 +929,9 @@ static struct dmi_system_id __initdata ec_dmi_table[] = { | |||
| 929 | ec_flag_msi, "MSI hardware", { | 929 | ec_flag_msi, "MSI hardware", { |
| 930 | DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star")}, NULL}, | 930 | DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star")}, NULL}, |
| 931 | { | 931 | { |
| 932 | ec_flag_msi, "MSI hardware", { | ||
| 933 | DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-STAR")}, NULL}, | ||
| 934 | { | ||
| 932 | ec_validate_ecdt, "ASUS hardware", { | 935 | ec_validate_ecdt, "ASUS hardware", { |
| 933 | DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL}, | 936 | DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL}, |
| 934 | {}, | 937 | {}, |