From 8918314c4d42d71ce39fa4ad3eb9feb8c6a33930 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 30 May 2006 20:32:15 -0700
Subject: [PATCH] --- yaml --- r: 27037 b: refs/heads/master c:
 9a8fca0499c611ab37b5c0d4481ca09d3f6e8101 h: refs/heads/master i:   27035:
 66e87b844e7ece0760b590c1d5bf471ec12de7ea v: v3

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

diff --git a/[refs] b/[refs]
index b4256e695de7..b679e6ffc401 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 822ff019f72ae01baef1893e86735f1a5e36be7d
+refs/heads/master: 9a8fca0499c611ab37b5c0d4481ca09d3f6e8101
diff --git a/trunk/arch/i386/kernel/acpi/boot.c b/trunk/arch/i386/kernel/acpi/boot.c
index daee69579b1c..40e5aba3ad3d 100644
--- a/trunk/arch/i386/kernel/acpi/boot.c
+++ b/trunk/arch/i386/kernel/acpi/boot.c
@@ -1066,14 +1066,6 @@ 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"),
-		    },
-	},
 	{}
 };