From 3a0cdc9e4cb1b73f2e6e5e3754cf8736456e0e28 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Mon, 15 May 2006 18:19:41 +0200
Subject: [PATCH] --- yaml --- r: 26735 b: refs/heads/master c:
 5491d0f3e206beb95eeb506510d62a1dab462df1 h: refs/heads/master i:   26733:
 a168ed278d8e6d9f746b175fa152672c38d07ab5   26731:
 5090ed5f85e4ce1d78d4a6c0651ff6d5526cc71e   26727:
 d860d478069ce7caef97b74c072e2b420f2eb835   26719:
 e89d53b9286a2845b94450a77e58274844b91964 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/i386/kernel/acpi/boot.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ab52f74298fb..497e8c4b522f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0fdabf8bf187c9aafeb139a828c530ef45cf022
+refs/heads/master: 5491d0f3e206beb95eeb506510d62a1dab462df1
diff --git a/trunk/arch/i386/kernel/acpi/boot.c b/trunk/arch/i386/kernel/acpi/boot.c
index 40e5aba3ad3d..daee69579b1c 100644
--- a/trunk/arch/i386/kernel/acpi/boot.c
+++ b/trunk/arch/i386/kernel/acpi/boot.c
@@ -1066,6 +1066,14 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
 		     DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
 		     },
 	 },
+	{
+	 .callback = disable_acpi_pci,
+	 .ident = "HP xw9300",
+	 .matches = {
+		    DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+		    DMI_MATCH(DMI_PRODUCT_NAME, "HP xw9300 Workstation"),
+		    },
+	},
 	{}
 };