diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /arch/i386/pci/acpi.c | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
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 | /* |