diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 18:47:29 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 18:47:29 +0200 |
commit | f87f38ec5a5157aa39f44f6018dc58ea62f8e0e2 (patch) | |
tree | 1612249d11d455cfd6a0d691f5564673ae179c5f /arch/x86/pci/irq.c | |
parent | a6784ad7eafa74a085c8458909eda0699a8fcf57 (diff) | |
parent | 8dd779b19ce5972072ad2372a86c8acbae4da768 (diff) |
Merge branch 'x86/unify-pci' into x86/core
Diffstat (limited to 'arch/x86/pci/irq.c')
-rw-r--r-- | arch/x86/pci/irq.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index f0859de23e2..dc568c6b83f 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c @@ -1107,7 +1107,7 @@ static struct dmi_system_id __initdata pciirq_dmi_table[] = { { } }; -static int __init pcibios_irq_init(void) +int __init pcibios_irq_init(void) { DBG(KERN_DEBUG "PCI: IRQ init\n"); @@ -1142,9 +1142,6 @@ static int __init pcibios_irq_init(void) return 0; } -subsys_initcall(pcibios_irq_init); - - static void pirq_penalize_isa_irq(int irq, int active) { /* |