From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753437Ab1AEXJ5 (ORCPT ); Wed, 5 Jan 2011 18:09:57 -0500 Received: from kroah.org ([198.145.64.141]:50781 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753236Ab1AEXG2 (ORCPT ); Wed, 5 Jan 2011 18:06:28 -0500 X-Mailbox-Line: From gregkh@clark.site Wed Jan 5 15:03:25 2011 Message-Id: <20110105230325.370187846@clark.site> User-Agent: quilt/0.48-11.2 Date: Wed, 05 Jan 2011 15:00:37 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Alexey Starikovskiy , Len Brown Subject: [19/49] ACPI: EC: Add another dmi match entry for MSI hardware In-Reply-To: <20110105230438.GA26241@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.32-longterm review patch. If anyone has any objections, please let us know. ------------------ From: Alexey Starikovskiy 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: Greg Kroah-Hartman --- drivers/acpi/ec.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -953,6 +953,9 @@ static struct dmi_system_id __initdata e 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}, {},