Commit 9a8fca04 authored by Linus Torvalds's avatar Linus Torvalds

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

This reverts commit 5491d0f3.

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: default avatarLinus Torvalds <torvalds@osdl.org>
parent 822ff019
...@@ -1066,14 +1066,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { ...@@ -1066,14 +1066,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), 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"),
},
},
{} {}
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment