Revert "[PATCH] i386/x86_64: Force pci=noacpi on HP XW9300"

This reverts commit 5491d0f3e206beb95eeb506510d62a1dab462df1.

As per Andi:

  "After some discussion with people who have the affected system it
   seems best to revert for 2.6.17.  It broke a common BIOS workaround
   and PCI-X still doesn't work.  Alternative is for people to change
   the BIOS which seems to be better right now."

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index daee69579b1c6cd6dba672b79c48a2197453f56a..40e5aba3ad3d425f1545ff7e199e1356a56e38d8 100644 (file)
--- a/arch/i386/kernel/acpi/boot.c
+++ b/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"),
-                   },
-       },
        {}
 };