diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-30 20:32:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-30 20:32:15 -0700 |
| commit | 9a8fca0499c611ab37b5c0d4481ca09d3f6e8101 (patch) | |
| tree | 7f79e9c5a0d4e3654eaac6f4988d277853a301d8 | |
| parent | 822ff019f72ae01baef1893e86735f1a5e36be7d (diff) | |
| download | linux-9a8fca0499c611ab37b5c0d4481ca09d3f6e8101.tar.gz linux-9a8fca0499c611ab37b5c0d4481ca09d3f6e8101.tar.bz2 linux-9a8fca0499c611ab37b5c0d4481ca09d3f6e8101.zip | |
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>
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index daee69579b1c..40e5aba3ad3d 100644 --- 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"), - }, - }, {} }; |