From 5a8fbb8b8c300dce47f7286bb08948202dc88b36 Mon Sep 17 00:00:00 2001
From: Paul Menzel <paulepanter@users.sourceforge.net>
Date: Wed, 31 Aug 2011 17:07:10 +0200
Subject: [PATCH] --- yaml --- r: 264279 b: refs/heads/master c:
 29cf7a30f8a0ce4af2406d93d5a332099be26923 h: refs/heads/master i:   264277:
 195394d5ad054b06e58706cd40c964eb2dc9ce9e   264275:
 ed2075e5194a360d40fec4d52b9e5d989249f538   264271:
 309e18e9a27fd66fed36414f17c4e5932e8831df v: v3

---
 [refs]                    |  2 +-
 trunk/arch/x86/pci/acpi.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a4a630fe4a2a..e36978507243 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6367f1775ebb66b0f0e9e3512159f3257a6fde0e
+refs/heads/master: 29cf7a30f8a0ce4af2406d93d5a332099be26923
diff --git a/trunk/arch/x86/pci/acpi.c b/trunk/arch/x86/pci/acpi.c
index 039d91315bc5..404f21a3ff9e 100644
--- a/trunk/arch/x86/pci/acpi.c
+++ b/trunk/arch/x86/pci/acpi.c
@@ -43,6 +43,17 @@ static const struct dmi_system_id pci_use_crs_table[] __initconst = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "ALiveSATA2-GLAN"),
                 },
         },
+	/* https://bugzilla.kernel.org/show_bug.cgi?id=30552 */
+	/* 2006 AMD HT/VIA system with two host bridges */
+	{
+		.callback = set_use_crs,
+		.ident = "ASUS M2V-MX SE",
+		.matches = {
+			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+			DMI_MATCH(DMI_BOARD_NAME, "M2V-MX SE"),
+			DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
+		},
+	},
 	{}
 };