summaryrefslogtreecommitdiffstats
path: root/arch/i386/pci/acpi.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-17 00:51:31 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-17 00:51:31 -0400
commita2e30e529a48ef4e106e405f91cf4ae525bb01c4 (patch)
tree2def96ef17c0672c30f1a10287552978bf1d0b1c /arch/i386/pci/acpi.c
parentedb3366703224d5d8df573ae698ccd6b488dc743 (diff)
parent2ad56496627630ebc99f06af5f81ca23e17e014e (diff)
downloadkernel-crypto-a2e30e529a48ef4e106e405f91cf4ae525bb01c4.tar.gz
kernel-crypto-a2e30e529a48ef4e106e405f91cf4ae525bb01c4.tar.xz
kernel-crypto-a2e30e529a48ef4e106e405f91cf4ae525bb01c4.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/i386/pci/acpi.c')
-rw-r--r--arch/i386/pci/acpi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/pci/acpi.c b/arch/i386/pci/acpi.c
index 2db65ec45dc..42913f43feb 100644
--- a/arch/i386/pci/acpi.c
+++ b/arch/i386/pci/acpi.c
@@ -30,6 +30,7 @@ static int __init pci_acpi_init(void)
acpi_irq_penalty_init();
pcibios_scanned++;
pcibios_enable_irq = acpi_pci_irq_enable;
+ pcibios_disable_irq = acpi_pci_irq_disable;
if (pci_routeirq) {
/*