diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-29 23:11:11 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-29 23:11:11 -0400 |
| commit | dd8f39bbf5154cdbfd698fc70c66faba33eafa44 (patch) | |
| tree | 9df3fe38a57d0ea056ffa11b1fb95b8908e73af5 /arch/i386/pci/acpi.c | |
| parent | c2c2e03409f5f5405e79d9d9156202b75cb5b35b (diff) | |
| parent | 87bec66b9691522414862dd8d41e430b063735ef (diff) | |
Merge ../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 | /* |