pcibios_scan_specific_bus calls pci_scan_bus_on_node which is __devinit. Mark it __devinit as well. All users are now __init or __devinit. Remark update_res from __init to __devinit as it is called also from __devinit functions. Signed-off-by: Jiri Slaby <jslaby@xxxxxxx> Cc: Aristeu Sergio <arozansk@xxxxxxxxxx> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> Cc: linux-pci@xxxxxxxxxxxxxxx Cc: x86@xxxxxxxxxx --- arch/x86/pci/amd_bus.c | 2 +- arch/x86/pci/legacy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c index 995f360..b78ffff 100644 --- a/arch/x86/pci/amd_bus.c +++ b/arch/x86/pci/amd_bus.c @@ -119,7 +119,7 @@ static void __init update_range(struct res_range *range, size_t start, } } -void __init update_res(struct pci_root_info *info, size_t start, +void __devinit update_res(struct pci_root_info *info, size_t start, size_t end, unsigned long flags, int merge) { int i; diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c index a8194c8..8cf7835 100644 --- a/arch/x86/pci/legacy.c +++ b/arch/x86/pci/legacy.c @@ -39,7 +39,7 @@ static int __init pci_legacy_init(void) return 0; } -void pcibios_scan_specific_bus(int busn) +void __devinit pcibios_scan_specific_bus(int busn) { int devfn; long node; -- 1.6.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html