From f32bc3fe41812dd99d37ef33d465c35e42b42e15 Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue, 28 Feb 2012 11:51:10 -0700
Subject: [PATCH] --- yaml --- r: 288203 b: refs/heads/master c:
 8411371709610c826bf65684f886bfdfb5780ca1 h: refs/heads/master i:   288201:
 800e416802092cac9e293823302710306efface3   288199:
 3da37f2d6c607583dda4b0171f1bcc78491c6806 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 f36a343ac416..98b0003bcba6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cc1c96c1658bfaf85d06d764bd7ac00640ae90f
+refs/heads/master: 8411371709610c826bf65684f886bfdfb5780ca1
diff --git a/trunk/arch/x86/pci/acpi.c b/trunk/arch/x86/pci/acpi.c
index c33e0970ee9f..7034c081b226 100644
--- a/trunk/arch/x86/pci/acpi.c
+++ b/trunk/arch/x86/pci/acpi.c
@@ -60,6 +60,17 @@ static const struct dmi_system_id pci_use_crs_table[] __initconst = {
 			DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
 		},
 	},
+	/* https://bugzilla.kernel.org/show_bug.cgi?id=42619 */
+	{
+		.callback = set_use_crs,
+		.ident = "MSI MS-7253",
+		.matches = {
+			DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
+			DMI_MATCH(DMI_BOARD_NAME, "MS-7253"),
+			DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"),
+			DMI_MATCH(DMI_BIOS_VERSION, "V1.6"),
+		},
+	},
 
 	/* Now for the blacklist.. */