Commit 9a8fca04 authored May 30, 2006 by 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: Linus Torvalds <torvalds@osdl.org>

parent 822ff019

arch/i386/kernel/acpi/boot.c

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -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"),
	},
	},
	{}		{}
	};		};