From: Alexey Starikovskiy Date: Thu, 9 Dec 2010 22:07:54 +0000 (-0500) Subject: ACPI: EC: Add another dmi match entry for MSI hardware X-Git-Tag: v2.6.34.9~38 X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=5d58e3d7b5706db97da40c19a10c9cec41074190;p=unionfs-2.6.39.y.git ACPI: EC: Add another dmi match entry for MSI hardware commit a5dc4f898c2a0f66e2cefada6c687db82ba2fcbc upstream. http://bugzilla.kernel.org/show_bug.cgi?id=15418 Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown Signed-off-by: Paul Gortmaker --- diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index f2234db85da..315368e1e1f 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -996,6 +996,9 @@ static struct dmi_system_id __initdata ec_dmi_table[] = { ec_flag_msi, "MSI hardware", { DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star")}, NULL}, { + ec_flag_msi, "MSI hardware", { + DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-STAR")}, NULL}, + { ec_validate_ecdt, "ASUS hardware", { DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL}, {},