diff options
Diffstat (limited to 'arch/mips/pci/pci.c')
-rw-r--r-- | arch/mips/pci/pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 271e8c4a54c7..690356808f8a 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c | |||
@@ -102,7 +102,7 @@ static void __devinit pcibios_scanbus(struct pci_controller *hose) | |||
102 | need_domain_info = need_domain_info || hose->index; | 102 | need_domain_info = need_domain_info || hose->index; |
103 | hose->need_domain_info = need_domain_info; | 103 | hose->need_domain_info = need_domain_info; |
104 | if (bus) { | 104 | if (bus) { |
105 | next_busno = bus->subordinate + 1; | 105 | next_busno = bus->busn_res.end + 1; |
106 | /* Don't allow 8-bit bus number overflow inside the hose - | 106 | /* Don't allow 8-bit bus number overflow inside the hose - |
107 | reserve some space for bridges. */ | 107 | reserve some space for bridges. */ |
108 | if (next_busno > 224) { | 108 | if (next_busno > 224) { |
@@ -348,9 +348,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
348 | vma->vm_end - vma->vm_start, vma->vm_page_prot); | 348 | vma->vm_end - vma->vm_start, vma->vm_page_prot); |
349 | } | 349 | } |
350 | 350 | ||
351 | char * (*pcibios_plat_setup)(char *str) __devinitdata; | 351 | char * (*pcibios_plat_setup)(char *str) __initdata; |
352 | 352 | ||
353 | char *__devinit pcibios_setup(char *str) | 353 | char *__init pcibios_setup(char *str) |
354 | { | 354 | { |
355 | if (pcibios_plat_setup) | 355 | if (pcibios_plat_setup) |
356 | return pcibios_plat_setup(str); | 356 | return pcibios_plat_setup(str); |