diff options
| author | Len Brown <len.brown@intel.com> | 2007-03-09 23:18:05 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-03-09 23:18:05 -0500 |
| commit | 653351b0b9c97d4ec93aed499b542cbcd85309ca (patch) | |
| tree | be71f81effd893918c9fd3e1786dedefe5fcdadc /arch/i386 | |
| parent | 5cb69bcacea70024252138a9cb4229a142a93389 (diff) | |
| parent | 74586fca38109d2fc75daf678635928f64b4ccec (diff) | |
| download | kernel-crypto-653351b0b9c97d4ec93aed499b542cbcd85309ca.tar.gz kernel-crypto-653351b0b9c97d4ec93aed499b542cbcd85309ca.tar.xz kernel-crypto-653351b0b9c97d4ec93aed499b542cbcd85309ca.zip | |
Pull bugzilla-5966 into release branch
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index e5eb97a910e..9ea5b8ecc7e 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -1072,7 +1072,28 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { "ASUS A7V ACPI BIOS Revision 1007"), }, }, - + { + /* + * Latest BIOS for IBM 600E (1.16) has bad pcinum + * for LPC bridge, which is needed for the PCI + * interrupt links to work. DSDT fix is in bug 5966. + * 2645, 2646 model numbers are shared with 600/600E/600X + */ + .callback = disable_acpi_irq, + .ident = "IBM Thinkpad 600 Series 2645", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "IBM"), + DMI_MATCH(DMI_BOARD_NAME, "2645"), + }, + }, + { + .callback = disable_acpi_irq, + .ident = "IBM Thinkpad 600 Series 2646", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "IBM"), + DMI_MATCH(DMI_BOARD_NAME, "2646"), + }, + }, /* * Boxes that need ACPI PCI IRQ routing and PCI scan disabled */ |