x86: Add pci_init_irq to x86_init

[net-next-2.6.git] / arch / x86 / include / asm / pci_x86.h

diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
index 440124f1224d0f248b86c0b533d149406ec9d02a..46511c5be4561d16a4bbb48f931656aab8ca6dbb 100644 (file)
--- a/arch/x86/include/asm/pci_x86.h
+++ b/arch/x86/include/asm/pci_x86.h
@@ -110,7 +110,7 @@ extern void __init dmi_check_skip_isa_align(void);
 
 /* some common used subsys_initcalls */
 extern int __init pci_acpi_init(void);
-extern int __init pcibios_irq_init(void);
+extern void __init pcibios_irq_init(void);
 extern int __init pcibios_init(void);
 extern int pci_legacy_init(void);
 
@@ -187,6 +187,8 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)
 # else
 #  define x86_default_pci_init         pci_legacy_init
 # endif
+# define x86_default_pci_init_irq      pcibios_irq_init
 #else
 # define x86_default_pci_init          NULL
+# define x86_default_pci_init_irq      NULL
 #endif