diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-30 13:15:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-30 13:15:57 -0400 |
| commit | 6d1d07e41a1de478a0da3cc14b4a8054ef09931c (patch) | |
| tree | db7802272fd8aff185a6ecc29ea78c1e3005783b /arch/i386/pci/acpi.c | |
| parent | d7a465b4740806e4ee34061ad455595b2fa9fad5 (diff) | |
| parent | adbedd34244e2b054557002817f979a9b004a405 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus
Diffstat (limited to 'arch/i386/pci/acpi.c')
| -rw-r--r-- | arch/i386/pci/acpi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/pci/acpi.c b/arch/i386/pci/acpi.c index 2db65ec45dc3..42913f43feb0 100644 --- a/arch/i386/pci/acpi.c +++ b/arch/i386/pci/acpi.c | |||
| @@ -30,6 +30,7 @@ static int __init pci_acpi_init(void) | |||
| 30 | acpi_irq_penalty_init(); | 30 | acpi_irq_penalty_init(); |
| 31 | pcibios_scanned++; | 31 | pcibios_scanned++; |
| 32 | pcibios_enable_irq = acpi_pci_irq_enable; | 32 | pcibios_enable_irq = acpi_pci_irq_enable; |
| 33 | pcibios_disable_irq = acpi_pci_irq_disable; | ||
| 33 | 34 | ||
| 34 | if (pci_routeirq) { | 35 | if (pci_routeirq) { |
| 35 | /* | 36 | /* |